treewide: move LD_LIBRARY_PATH into env for structuredAttrs (#486104)

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

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

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
   ];

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
   '';

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

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

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"