Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-04-04 15:24:52 +00:00
parent f519a255a5 84f3cd3e9b
commit bbbaccfa68
117 changed files with 24270 additions and 903 deletions
@@ -121,9 +121,14 @@ stdenv.mkDerivation rec {
    find $ICAInstDir -type f -exec file {} \; |
      grep 'ELF.*executable' |
      cut -f 1 -d : |
-      xargs -t -n 1 patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$ICAInstDir:$libPath"
+      while read f
+      do
+        echo "Patching ELF intrepreter and rpath for $f"
+        chmod u+w "$f"
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          --set-rpath "$ICAInstDir:$libPath" "$f"
+      done

    echo "Wrapping wfica..."
    mkdir "$out/bin"