synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
2011-11-02 10:28:32 +00:00
parent 4d0d7d78c5 c882363fce
commit 69488d688d
110 changed files with 830 additions and 520 deletions
@@ -27,7 +27,7 @@ done
 echo "closure:"
 ensureDir $out/lib/modules/"$version"
 for module in $closure; do
-    target=$(echo $module | sed "s^/nix/store/.*/lib/modules/^$out/lib/modules/^")
+    target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^")
    if test -e "$target"; then continue; fi
    if test \! -e "$module"; then continue; fi # XXX: to avoid error with "cp builtin builtin"
    mkdir -p $(dirname $target)