From 4b045c70664617180c776d3d301fb7563572e66f Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Thu, 12 May 2022 21:35:33 +0200 Subject: [PATCH] nixos/stage-1: Remove redundant symlink check find(1)'s test `-type f` already excludes symbolic links, so `test -L` will never return false for found files. --- nixos/modules/system/boot/stage-1.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index adb8eb7ccf73..ec2bd5ef3523 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -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