Author: amiddelk
Date: Fri Feb 24 00:17:09 2012
New Revision: 32531
URL: https://nixos.org/websvn/nix/?rev=32531&sc=1
Log:
Let 'bbswitch' and 'acpi-call' use the attribute kernel.version instead of a
nasty 'ls' to determine the kernel version.
Modified:
nixpkgs/trunk/pkgs/os-specific/linux/acpi-call/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix
Modified: nixpkgs/trunk/pkgs/os-specific/linux/acpi-call/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/acpi-call/default.nix Thu Feb 23
23:50:56 2012 (r32530)
+++ nixpkgs/trunk/pkgs/os-specific/linux/acpi-call/default.nix Fri Feb 24
00:17:09 2012 (r32531)
@@ -10,16 +10,14 @@
};
preBuild = ''
- kernelVersion=$(cd ${kernel}/lib/modules && ls)
sed -e 's/break/true/' -i test_off.sh
sed -e 's@/bin/bash@.bin/sh@' -i test_off.sh
- sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/$kernelVersion@" -i
Makefile
+ sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/${kernel.version}@" -i
Makefile
'';
installPhase = ''
- kernelVersion=$(cd ${kernel}/lib/modules && ls)
- ensureDir $out/lib/modules/$kernelVersion/misc
- cp acpi_call.ko $out/lib/modules/$kernelVersion/misc
+ ensureDir $out/lib/modules/${kernel.version}/misc
+ cp acpi_call.ko $out/lib/modules/${kernel.version}/misc
ensureDir $out/bin
cp test_off.sh $out/bin/test_discrete_video_off.sh
'';
Modified: nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix Thu Feb 23
23:50:56 2012 (r32530)
+++ nixpkgs/trunk/pkgs/os-specific/linux/bbswitch/default.nix Fri Feb 24
00:17:09 2012 (r32531)
@@ -17,14 +17,13 @@
preBuild = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls)
substituteInPlace Makefile \
- --replace "\$(shell uname -r)" "$kernelVersion" \
+ --replace "\$(shell uname -r)" "${kernel.version}" \
--replace "/lib/modules" "${kernel}/lib/modules"
'';
installPhase = ''
- kernelVersion=$(cd ${kernel}/lib/modules && ls)
- ensureDir $out/lib/modules/$kernelVersion/misc
- cp bbswitch.ko $out/lib/modules/$kernelVersion/misc
+ ensureDir $out/lib/modules/${kernel.version}/misc
+ cp bbswitch.ko $out/lib/modules/${kernel.version}/misc
ensureDir $out/bin
tee $out/bin/discrete_vga_poweroff << EOF
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
