public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let 'bbswitch' and 'acpi-call' use the attribute kernel.version instead of a nasty 'ls' to determine the kernel version.

Browse Source 
svn path=/nixpkgs/trunk/; revision=32531
This commit is contained in:
Arie Middelkoop 2012-02-24 00:17:09 +00:00
parent 70d56e0638
commit ed813f3955
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/acpi-call/default.nix
View File

@ -10,16 +10,14 @@ stdenv.mkDerivation {
}; };
preBuild = '' preBuild = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls)
sed -e 's/break/true/' -i test_off.sh sed -e 's/break/true/' -i test_off.sh
sed -e 's@/bin/bash@.bin/sh@' -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 = '' installPhase = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls) ensureDir $out/lib/modules/${kernel.version}/misc
ensureDir $out/lib/modules/$kernelVersion/misc cp acpi_call.ko $out/lib/modules/${kernel.version}/misc
cp acpi_call.ko $out/lib/modules/$kernelVersion/misc
ensureDir $out/bin ensureDir $out/bin
cp test_off.sh $out/bin/test_discrete_video_off.sh cp test_off.sh $out/bin/test_discrete_video_off.sh
''; '';

7
pkgs/os-specific/linux/bbswitch/default.nix
View File

@ -17,14 +17,13 @@ stdenv.mkDerivation {
preBuild = '' preBuild = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls) kernelVersion=$(cd ${kernel}/lib/modules && ls)
substituteInPlace Makefile \ substituteInPlace Makefile \
--replace "\$(shell uname -r)" "$kernelVersion" \ --replace "\$(shell uname -r)" "${kernel.version}" \
--replace "/lib/modules" "${kernel}/lib/modules" --replace "/lib/modules" "${kernel}/lib/modules"
''; '';
installPhase = '' installPhase = ''
kernelVersion=$(cd ${kernel}/lib/modules && ls) ensureDir $out/lib/modules/${kernel.version}/misc
ensureDir $out/lib/modules/$kernelVersion/misc cp bbswitch.ko $out/lib/modules/${kernel.version}/misc
cp bbswitch.ko $out/lib/modules/$kernelVersion/misc
ensureDir $out/bin ensureDir $out/bin
tee $out/bin/discrete_vga_poweroff << EOF tee $out/bin/discrete_vga_poweroff << EOF