b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos/stage-1: Remove redundant symlink check

Browse source 
find(1)'s test `-type f` already excludes symbolic links, so `test -L`
will never return false for found files.
This commit is contained in:
Klemens Nanni 2022-05-12 21:35:33 +02:00
parent de77849ad6
commit 4b045c7066
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/system/boot/stage-1.nix
View file

@ -223,16 +223,12 @@ let
# Run patchelf to make the programs refer to the copied libraries.
find $out/bin $out/lib -type f | while read i; do
if ! test -L $i; then
nuke-refs -e $out $i
fi
nuke-refs -e $out $i
done
find $out/bin -type f | while read i; do
if ! test -L $i; then
echo "patching $i..."
patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true
fi
echo "patching $i..."
patchelf --set-interpreter $out/lib/ld*.so.? --set-rpath $out/lib $i || true
done
if [ -z "${toString (pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform)}" ]; then