diff options
| author | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-24 00:17:09 +0000 |
|---|---|---|
| committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-02-24 00:17:09 +0000 |
| commit | ed813f3955595ffd594570f74f406f3b6319610a (patch) | |
| tree | 2f7dcd966845189319b53c2f84ef442c26d6710f /pkgs | |
| parent | 70d56e06383cfa6eb547ce7f1882bfcd95b1e813 (diff) | |
| download | nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.tar nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.tar.gz nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.tar.bz2 nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.tar.lz nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.tar.xz nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.tar.zst nixpkgs-ed813f3955595ffd594570f74f406f3b6319610a.zip | |
Let 'bbswitch' and 'acpi-call' use the attribute kernel.version instead of a nasty 'ls' to determine the kernel version.
svn path=/nixpkgs/trunk/; revision=32531
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/acpi-call/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/bbswitch/default.nix | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index d7c9e2c3695..f9615da0c2f 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -10,16 +10,14 @@ stdenv.mkDerivation { }; 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 ''; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index a8f8a9d33ef..7c5752b4e34 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -17,14 +17,13 @@ stdenv.mkDerivation { 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 |