summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2010-11-17 17:03:09 +0000
committerMichael Raskin <7c6f434c@mail.ru>2010-11-17 17:03:09 +0000
commitfb58f74d82e701dd30c062d0b153715d648cba18 (patch)
tree921a40baa6cbf2708a1d4ca4c443378664fc08f6 /pkgs/os-specific
parent2254567b311180451dc690f2e0ddcfe9f6d2d44e (diff)
parent7ad36d19401603bcb391c915504571e3a6bf9794 (diff)
downloadnixlib-fb58f74d82e701dd30c062d0b153715d648cba18.tar
nixlib-fb58f74d82e701dd30c062d0b153715d648cba18.tar.gz
nixlib-fb58f74d82e701dd30c062d0b153715d648cba18.tar.bz2
nixlib-fb58f74d82e701dd30c062d0b153715d648cba18.tar.lz
nixlib-fb58f74d82e701dd30c062d0b153715d648cba18.tar.xz
nixlib-fb58f74d82e701dd30c062d0b153715d648cba18.tar.zst
nixlib-fb58f74d82e701dd30c062d0b153715d648cba18.zip
Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/acpi-call/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix
index 996409d786a0..1a9b3cbf74dc 100644
--- a/pkgs/os-specific/linux/acpi-call/default.nix
+++ b/pkgs/os-specific/linux/acpi-call/default.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation {
   name = "acpi-call";
 
   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}/&@" -i Makefile
+    sed -e "s@/lib/modules/\$(.*)@${kernel}/lib/modules/$kernelVersion@" -i Makefile
   '';
  
   installPhase = ''