From 9eb704b65a43047d136218b98e6f01fc20a6e83c Mon Sep 17 00:00:00 2001 From: Klemens Nanni Date: Sun, 15 May 2022 01:35:15 +0200 Subject: [PATCH] nixos/stage-1: Zap no longer needed LD_LIBRARY_PATH The previous commit properly adjusts all library paths, thus no need to forcefully adjust the path at runtime any longer. --- nixos/modules/system/boot/stage-1.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 2900919b4b60..e35ccff29078 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -240,7 +240,6 @@ let # Make sure that the patchelf'ed binaries still work. echo "testing patched programs..." $out/bin/ash -c 'echo hello world' | grep "hello world" - export LD_LIBRARY_PATH=$out/lib ${if zfsRequiresMountHelper then '' $out/bin/mount -V 1>&1 | grep -q "mount from util-linux" $out/bin/mount.zfs -h 2>&1 | grep -q "Usage: mount.zfs" @@ -285,8 +284,6 @@ let } '' mkdir -p $out - echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules - cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/ cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/ cp -v ${udev}/lib/udev/rules.d/75-net-description.rules $out/