add get* helper functions and mass-replace manual outputs search with them

2016-04-25 13:24:39 +03:00
parent c779e30d53
commit 5ff40ddedf
20 changed files with 67 additions and 64 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.out}/lib/ld-linux.so.2 \
-                 --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.out}/lib \
+        patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
+                 --set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \
                 "$f" || true
      fi
    done