From 158e29fc8f8ae25f6e8491dd8eb7c9225f285c78 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:06 +0100 Subject: [PATCH 1/7] age-plugin-se: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/by-name/ag/age-plugin-se/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ag/age-plugin-se/package.nix b/pkgs/by-name/ag/age-plugin-se/package.nix index 3d3fb847dc20..54fc939d053a 100644 --- a/pkgs/by-name/ag/age-plugin-se/package.nix +++ b/pkgs/by-name/ag/age-plugin-se/package.nix @@ -26,8 +26,10 @@ stdenv.mkDerivation (finalAttrs: { swiftpm ]; - # Can't find libdispatch without this on NixOS. (swift 5.8) - LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${swiftPackages.Dispatch}/lib"; + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + # Can't find libdispatch without this on NixOS. (swift 5.8) + LD_LIBRARY_PATH = "${swiftPackages.Dispatch}/lib"; + }; postPatch = let From 48fdb067183098664dd4753b17c6e59cac7811e7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:06 +0100 Subject: [PATCH 2/7] nethoscope: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/by-name/ne/nethoscope/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/nethoscope/package.nix b/pkgs/by-name/ne/nethoscope/package.nix index 5344351681b5..279b0681d6b6 100644 --- a/pkgs/by-name/ne/nethoscope/package.nix +++ b/pkgs/by-name/ne/nethoscope/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { libpcap ]; - LD_LIBRARY_PATH = lib.makeLibraryPath [ + env.LD_LIBRARY_PATH = lib.makeLibraryPath [ libpcap alsa-lib ]; From f6c585e81be55949c439562f354c2bdfc28946a7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:07 +0100 Subject: [PATCH 3/7] pgloader: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/by-name/pg/pgloader/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgloader/package.nix b/pkgs/by-name/pg/pgloader/package.nix index a2c806acc6a7..753560fefbe1 100644 --- a/pkgs/by-name/pg/pgloader/package.nix +++ b/pkgs/by-name/pg/pgloader/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { openssl ]; - LD_LIBRARY_PATH = lib.makeLibraryPath [ + env.LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' install -Dm755 pgloader-bundle-${finalAttrs.version}/bin/pgloader "$out/bin/pgloader" - wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${finalAttrs.LD_LIBRARY_PATH}" + wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${finalAttrs.env.LD_LIBRARY_PATH}" mkdir -p $out/bin $out/man/man1 installManPage source/docs/_build/man/*.1 ''; From 0592ce4de2a73646c4d2ce5e22382f6b1eff76fc Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:07 +0100 Subject: [PATCH 4/7] protoc-gen-swift: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/by-name/pr/protoc-gen-swift/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix index c725f9afe1ca..c7bb3501b08f 100644 --- a/pkgs/by-name/pr/protoc-gen-swift/package.nix +++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix @@ -31,12 +31,12 @@ stdenv.mkDerivation (finalAttrs: { swiftPackages.Dispatch ]; - # swiftpm fails to found libdispatch.so on Linux - LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux ( - lib.makeLibraryPath [ + env = lib.optionalAttrs stdenv.hostPlatform.isLinux { + # swiftpm fails to found libdispatch.so on Linux + LD_LIBRARY_PATH = lib.makeLibraryPath [ swiftPackages.Dispatch - ] - ); + ]; + }; installPhase = '' runHook preInstall From a35c3b1f6561e74e4a683bed9587c25a630fcf6b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:07 +0100 Subject: [PATCH 5/7] sc-controller: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/by-name/sc/sc-controller/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/sc-controller/package.nix b/pkgs/by-name/sc/sc-controller/package.nix index e53757448b1e..8f4bff2936d2 100644 --- a/pkgs/by-name/sc/sc-controller/package.nix +++ b/pkgs/by-name/sc/sc-controller/package.nix @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace scc/device_monitor.py --replace "find_library('bluetooth')" "'libbluetooth.so.3'" ''; - LD_LIBRARY_PATH = lib.makeLibraryPath [ + env.LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libXext libXfixes From 4f954d1ac4597d544c4726f0bdb9d5cfc43c6ca4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:21 +0100 Subject: [PATCH 6/7] nyxt: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/applications/networking/browsers/nyxt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/nyxt/default.nix b/pkgs/applications/networking/browsers/nyxt/default.nix index c1f16bda6aa1..84cae74b7ff8 100644 --- a/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/pkgs/applications/networking/browsers/nyxt/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ]; # for cffi - LD_LIBRARY_PATH = lib.makeLibraryPath [ + env.LD_LIBRARY_PATH = lib.makeLibraryPath [ glib gobject-introspection gdk-pixbuf From 072a5d050a779f40398ae7821e4c03eb2f4263f1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 01:20:32 +0100 Subject: [PATCH 7/7] firebird*: move LD_LIBRARY_PATH into env for structuredAttrs --- pkgs/servers/firebird/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 1377a7d5454d..da7146611cd3 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -40,7 +40,7 @@ let icu73 ]; - LD_LIBRARY_PATH = lib.makeLibraryPath [ icu73 ]; + env.LD_LIBRARY_PATH = lib.makeLibraryPath [ icu73 ]; configureFlags = [ "--with-system-editline"