Merge branch 'staging', containing closure-size #7701

2016-04-13 09:25:28 +02:00
parent 81cedab4f1 87b49397bf
commit 39ebb01d6e
882 changed files with 8958 additions and 2482 deletions
@@ -33,8 +33,8 @@ stdenv.mkDerivation {

    for f in $(find $out); do
      if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
-        patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
-                 --set-rpath $out/lib:${gcc}/lib:${ncurses}/lib \
+        patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
+                 --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.out}/lib \
                 "$f" || true
      fi
    done