public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stage-1: Remove doublePatchelf hack

Browse Source 
No longer needed with the new patchelf version.
This commit is contained in:
Tuomas Tynkkynen 2016-02-06 13:46:52 +02:00
parent 9cc1b065ca
commit ab428dce14
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/system/boot/stage-1.nix
View File

@ -31,7 +31,6 @@ let
extraUtils = pkgs.runCommand "extra-utils" extraUtils = pkgs.runCommand "extra-utils"
{ buildInputs = [pkgs.nukeReferences]; { buildInputs = [pkgs.nukeReferences];
allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd
doublePatchelf = pkgs.stdenv.isArm;
} }
'' ''
set +o pipefail set +o pipefail
@ -111,9 +110,6 @@ let
if ! test -L $i; then if ! test -L $i; then
echo "patching $i..." echo "patching $i..."
patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true
if [ -n "$doublePatchelf" ]; then
patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true
fi
fi fi
done done