diff options
author | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2012-02-25 19:57:34 +0000 |
commit | ea195b2507b9068d966009d27c0e90b57d88f30d (patch) | |
tree | 287b4453ffa21139715bb1c1c57e6d01d1045295 /pkgs/os-specific/linux/acpi-call | |
parent | 38e3d7bc86d2a48dd4d653fd3f142f422c075563 (diff) | |
parent | 385f242a400749b3923d51fff5a86403e6dab0dc (diff) |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
Diffstat (limited to 'pkgs/os-specific/linux/acpi-call')
-rw-r--r-- | pkgs/os-specific/linux/acpi-call/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 3fececf6c6db4..301a8054557cc 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) - mkdir -p $out/lib/modules/$kernelVersion/misc - cp acpi_call.ko $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/${kernel.version}/misc + cp acpi_call.ko $out/lib/modules/${kernel.version}/misc mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh ''; |