From eea3d65944ede1f4b6374430b708c6207ea5e00f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:33 +0100 Subject: [PATCH 01/26] acpica-tools: move env variable(s) into env for structuredAttrs --- pkgs/by-name/ac/acpica-tools/package.nix | 26 +++++++++++++----------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 2b0d3601c46b..4f3420a991d8 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -34,21 +34,23 @@ stdenv.mkDerivation (finalAttrs: { "iasl" ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-O3" - ]; + env = { + NIX_CFLAGS_COMPILE = toString [ + "-O3" + ]; + + # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable + # -Werror altogether to make this derivation less fragile to toolchain + # updates. + NOWERROR = "TRUE"; + + # We can handle stripping ourselves. + # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. + INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; + }; enableParallelBuilding = true; - # i686 builds fail with hardening enabled (due to -Wformat-overflow). Disable - # -Werror altogether to make this derivation less fragile to toolchain - # updates. - NOWERROR = "TRUE"; - - # We can handle stripping ourselves. - # Unless we are on Darwin. Upstream makefiles degrade coreutils install to cp if _APPLE is detected. - INSTALLFLAGS = lib.optionals (!stdenv.hostPlatform.isDarwin) "-m 555"; - installFlags = [ "PREFIX=${placeholder "out"}" ]; passthru.updateScript = nix-update-script { }; From 7e878a21570680d73b0addfd8605ed2b94bd13d0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:36 +0100 Subject: [PATCH 02/26] botamusique: move env variable(s) into env for structuredAttrs --- pkgs/by-name/bo/botamusique/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/bo/botamusique/package.nix b/pkgs/by-name/bo/botamusique/package.nix index 55b85a96111d..8d86a367d3ee 100644 --- a/pkgs/by-name/bo/botamusique/package.nix +++ b/pkgs/by-name/bo/botamusique/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { --replace "version = 'git'" "version = '${version}'" ''; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; nativeBuildInputs = [ makeWrapper From d702f9dd009ce8d0b331a509a6af2de853bc0413 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:36 +0100 Subject: [PATCH 03/26] clmagma: move env variable(s) into env for structuredAttrs --- pkgs/by-name/cl/clmagma/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/cl/clmagma/package.nix b/pkgs/by-name/cl/clmagma/package.nix index bfd23cb0bcb5..dbcbd91dc96f 100644 --- a/pkgs/by-name/cl/clmagma/package.nix +++ b/pkgs/by-name/cl/clmagma/package.nix @@ -60,12 +60,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - MKLROOT = "${mkl}"; - clBLAS = "${clblas}"; + env = { + MKLROOT = mkl; + clBLAS = clblas; - # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, - # which is not available. - OPENCL_VENDOR_PATH = "${intel-ocl}/etc/OpenCL/vendors"; + # Otherwise build looks for it in /run/opengl-driver/etc/OpenCL/vendors, + # which is not available. + OPENCL_VENDOR_PATH = "${intel-ocl}/etc/OpenCL/vendors"; + }; preBuild = '' # By default it tries to use GPU, and thus fails for CPUs From e2e7774e31b78d3cb76f32e1acdbac80555593d8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:37 +0100 Subject: [PATCH 04/26] coc-emmet: move env variable(s) into env for structuredAttrs --- pkgs/by-name/co/coc-emmet/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-emmet/package.nix b/pkgs/by-name/co/coc-emmet/package.nix index 7d2bd93c087d..40cac7149897 100644 --- a/pkgs/by-name/co/coc-emmet/package.nix +++ b/pkgs/by-name/co/coc-emmet/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; From 7143874abe3e17dbaf473d0a1d197f715b6ec100 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:37 +0100 Subject: [PATCH 05/26] coc-r-lsp: move env variable(s) into env for structuredAttrs --- pkgs/by-name/co/coc-r-lsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-r-lsp/package.nix b/pkgs/by-name/co/coc-r-lsp/package.nix index 5041dd5de652..da487906c18e 100644 --- a/pkgs/by-name/co/coc-r-lsp/package.nix +++ b/pkgs/by-name/co/coc-r-lsp/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; From 9b94a1c84e7b9a6c7e5fac129f98e6c1ae492670 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:37 +0100 Subject: [PATCH 06/26] coc-spell-checker: move env variable(s) into env for structuredAttrs --- pkgs/by-name/co/coc-spell-checker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-spell-checker/package.nix b/pkgs/by-name/co/coc-spell-checker/package.nix index b02556e9f636..4b6be645132a 100644 --- a/pkgs/by-name/co/coc-spell-checker/package.nix +++ b/pkgs/by-name/co/coc-spell-checker/package.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From 8d50c3064cd06fab73acdb92d5354078385efdee Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:37 +0100 Subject: [PATCH 07/26] coc-stylelint: move env variable(s) into env for structuredAttrs --- pkgs/by-name/co/coc-stylelint/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-stylelint/package.nix b/pkgs/by-name/co/coc-stylelint/package.nix index 40a12dbd98e4..482717d78380 100644 --- a/pkgs/by-name/co/coc-stylelint/package.nix +++ b/pkgs/by-name/co/coc-stylelint/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; From bd8facff8aae00334393209682c8470e2b7cadd7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:38 +0100 Subject: [PATCH 08/26] coc-vimlsp: move env variable(s) into env for structuredAttrs --- pkgs/by-name/co/coc-vimlsp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix index 395441c17dea..f08f17be1d96 100644 --- a/pkgs/by-name/co/coc-vimlsp/package.nix +++ b/pkgs/by-name/co/coc-vimlsp/package.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; From f8a5dd552d4441b33fa3e8b8ee80fd6b0614f3da Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:38 +0100 Subject: [PATCH 09/26] coc-wxml: move env variable(s) into env for structuredAttrs --- pkgs/by-name/co/coc-wxml/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/coc-wxml/package.nix b/pkgs/by-name/co/coc-wxml/package.nix index caf706f21679..5ec0005ef3df 100644 --- a/pkgs/by-name/co/coc-wxml/package.nix +++ b/pkgs/by-name/co/coc-wxml/package.nix @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { nodejs ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; passthru.updateScript = nix-update-script { }; From be10a1afbac42fa156085c05663b1bfca00d3e89 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:38 +0100 Subject: [PATCH 10/26] docbook2x: move env variable(s) into env for structuredAttrs --- pkgs/by-name/do/docbook2x/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/do/docbook2x/package.nix b/pkgs/by-name/do/docbook2x/package.nix index fbbe6e3daeb2..3413918f9499 100644 --- a/pkgs/by-name/do/docbook2x/package.nix +++ b/pkgs/by-name/do/docbook2x/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { # configure tries to find osx in PATH and hardcodes the resulting path # (if any) on the Perl code. this fails under strictDeps, so override # the autoconf test: - OSX = "${opensp}/bin/osx"; + env.OSX = "${opensp}/bin/osx"; postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal From dbf3c38b32008dd7efed7896f668ec997441d5fe Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:38 +0100 Subject: [PATCH 11/26] drill: move env variable(s) into env for structuredAttrs --- pkgs/by-name/dr/drill/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dr/drill/package.nix b/pkgs/by-name/dr/drill/package.nix index 1e88a744405b..2d06e6cf7905 100644 --- a/pkgs/by-name/dr/drill/package.nix +++ b/pkgs/by-name/dr/drill/package.nix @@ -24,8 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config ]; - OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; - OPENSSL_DIR = "${lib.getDev openssl}"; + env = { + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_DIR = "${lib.getDev openssl}"; + }; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl From aa591c65d94713977e678c6a517f6ae177ad8b77 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:38 +0100 Subject: [PATCH 12/26] ergogen: move env variable(s) into env for structuredAttrs --- pkgs/by-name/er/ergogen/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/er/ergogen/package.nix b/pkgs/by-name/er/ergogen/package.nix index 2dfc6400de20..169ac57f788e 100644 --- a/pkgs/by-name/er/ergogen/package.nix +++ b/pkgs/by-name/er/ergogen/package.nix @@ -24,7 +24,8 @@ buildNpmPackage (finalAttrs: { makeCacheWritable = true; dontNpmBuild = true; npmPackFlags = [ "--ignore-scripts" ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + + env.NODE_OPTIONS = "--openssl-legacy-provider"; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From ff8d9195bd0db0b128a1e2dfe670e5006185bb62 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:39 +0100 Subject: [PATCH 13/26] ergoscf: move env variable(s) into env for structuredAttrs --- pkgs/by-name/er/ergoscf/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/er/ergoscf/package.nix b/pkgs/by-name/er/ergoscf/package.nix index 322f6915cae3..de4d74093589 100644 --- a/pkgs/by-name/er/ergoscf/package.nix +++ b/pkgs/by-name/er/ergoscf/package.nix @@ -35,13 +35,15 @@ stdenv.mkDerivation (finalAttrs: { env = { # Required for compilation with gcc-14 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; - LDFLAGS = "-lblas -llapack"; + LDFLAGS = toString [ + "-lblas" + "-llapack" + ]; + OMP_NUM_THREADS = 2; # required for check phase }; enableParallelBuilding = true; - OMP_NUM_THREADS = 2; # required for check phase - # With "fortify3", there are test failures, such as: # Testing cnof CAMB3LYP/6-31G using FMM # *** buffer overflow detected ***: terminated From 1c09ea7e28305b044f5b706ee1e6747e7f1f40a6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:39 +0100 Subject: [PATCH 14/26] honeycomb-refinery: move env variable(s) into env for structuredAttrs --- pkgs/by-name/ho/honeycomb-refinery/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix index f64c596e492f..142581a155cf 100644 --- a/pkgs/by-name/ho/honeycomb-refinery/package.nix +++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { hash = "sha256-JHjjaK5WFRzDYuVkenfYowFsPnrF+Wjo85gQAbaVxO8="; }; - NO_REDIS_TEST = true; + env.NO_REDIS_TEST = true; patches = [ # Allows turning off the one test requiring a Redis service during build. From 16cbadac21d666ba5b43f08cd03e659dcead2db6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:39 +0100 Subject: [PATCH 15/26] mirakurun: move env variable(s) into env for structuredAttrs --- pkgs/by-name/mi/mirakurun/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/mirakurun/package.nix b/pkgs/by-name/mi/mirakurun/package.nix index 825ff812f01c..4317d296276b 100644 --- a/pkgs/by-name/mi/mirakurun/package.nix +++ b/pkgs/by-name/mi/mirakurun/package.nix @@ -37,7 +37,7 @@ buildNpmPackage rec { ]; # workaround for https://github.com/webpack/webpack/issues/14532 - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; postInstall = let From ee8e023d7fc3c77eb68b7f873af0c4230f7178be Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:39 +0100 Subject: [PATCH 16/26] mktemp: move env variable(s) into env for structuredAttrs --- pkgs/by-name/mk/mktemp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mk/mktemp/package.nix b/pkgs/by-name/mk/mktemp/package.nix index e0b6f1e88470..56d24f7ede8a 100644 --- a/pkgs/by-name/mk/mktemp/package.nix +++ b/pkgs/by-name/mk/mktemp/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.7"; # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. - NROFF = "${groff}/bin/nroff"; + env.NROFF = "${groff}/bin/nroff"; patches = [ # Pull upstream fix for parallel install failures. From 44ff73bac587f7f3a2168eec6bdc297c14269c19 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:40 +0100 Subject: [PATCH 17/26] nix-heuristic-gc: move env variable(s) into env for structuredAttrs --- pkgs/by-name/ni/nix-heuristic-gc/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix index 07a43fa9a1d7..4158c0d01421 100644 --- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix +++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { # NIX_SYSTEM suggested at # https://github.com/NixOS/nixpkgs/issues/386184#issuecomment-2692433531 - NIX_SYSTEM = nixVersions.nixComponents_2_30.nix-store.stdenv.hostPlatform.system; + env.NIX_SYSTEM = nixVersions.nixComponents_2_30.nix-store.stdenv.hostPlatform.system; buildInputs = [ boost From be4afe17984488617dd94683c3916835b02ef517 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:40 +0100 Subject: [PATCH 18/26] nix-web: move env variable(s) into env for structuredAttrs --- pkgs/by-name/ni/nix-web/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nix-web/package.nix b/pkgs/by-name/ni/nix-web/package.nix index 95bebd4c0e40..339a85f4789c 100644 --- a/pkgs/by-name/ni/nix-web/package.nix +++ b/pkgs/by-name/ni/nix-web/package.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = cargoFlags; cargoTestFlags = cargoFlags; - NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix"; + env.NIX_WEB_BUILD_NIX_CLI_PATH = "${nixPackage}/bin/nix"; meta = { description = "Web interface for the Nix store"; From 56da63d8208213519622945d891a4398a789b425 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:40 +0100 Subject: [PATCH 19/26] opentabletdriver: move env variable(s) into env for structuredAttrs --- pkgs/by-name/op/opentabletdriver/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix index f3b81bd51a94..ea6735f171dc 100644 --- a/pkgs/by-name/op/opentabletdriver/package.nix +++ b/pkgs/by-name/op/opentabletdriver/package.nix @@ -67,7 +67,7 @@ buildDotnetModule (finalAttrs: { buildInputs = finalAttrs.runtimeDeps; - OTD_CONFIGURATIONS = "${finalAttrs.src}/OpenTabletDriver.Configurations/Configurations"; + env.OTD_CONFIGURATIONS = "${finalAttrs.src}/OpenTabletDriver.Configurations/Configurations"; doCheck = true; testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; From f435b76a312afe462645fe5611cc8c5f469230a4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:40 +0100 Subject: [PATCH 20/26] prisma-engines_7: move env variable(s) into env for structuredAttrs --- pkgs/by-name/pr/prisma-engines_7/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prisma-engines_7/package.nix b/pkgs/by-name/pr/prisma-engines_7/package.nix index 39b5444528b9..9bcc16bc61bd 100644 --- a/pkgs/by-name/pr/prisma-engines_7/package.nix +++ b/pkgs/by-name/pr/prisma-engines_7/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-U5d/HkuWnD/XSrAJr5AYh+WPVGDOcK/e4sC0udPZoyU="; # Use system openssl. - OPENSSL_NO_VENDOR = 1; + env.OPENSSL_NO_VENDOR = 1; nativeBuildInputs = [ pkg-config ]; From 6b80570e453451f15528a20487ff78f0f5dd0c39 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:41 +0100 Subject: [PATCH 21/26] readeck: move env variable(s) into env for structuredAttrs --- pkgs/by-name/re/readeck/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix index 55ff948ef227..80d53127f561 100644 --- a/pkgs/by-name/re/readeck/package.nix +++ b/pkgs/by-name/re/readeck/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { npmRoot = "web"; - NODE_PATH = "$npmDeps"; + env.NODE_PATH = "$npmDeps"; preBuild = '' make generate From a30b004cd794a0a5b73c4be73c71e0b2416b70e6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:41 +0100 Subject: [PATCH 22/26] send: move env variable(s) into env for structuredAttrs --- pkgs/by-name/se/send/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/se/send/package.nix b/pkgs/by-name/se/send/package.nix index 9c6ebdbb96b7..51486020a37c 100644 --- a/pkgs/by-name/se/send/package.nix +++ b/pkgs/by-name/se/send/package.nix @@ -28,14 +28,14 @@ buildNpmPackage rec { env = { PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "true"; + + NODE_OPTIONS = "--openssl-legacy-provider"; }; makeCacheWritable = true; npmPackFlags = [ "--ignore-scripts" ]; - NODE_OPTIONS = "--openssl-legacy-provider"; - postInstall = '' cp -r dist $out/lib/node_modules/send/ ln -s $out/lib/node_modules/send/dist/version.json $out/lib/node_modules/send/version.json From e553474cf67c4a84295afcd6a315b3e0a69d2483 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:41 +0100 Subject: [PATCH 23/26] sharing: move env variable(s) into env for structuredAttrs --- pkgs/by-name/sh/sharing/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sh/sharing/package.nix b/pkgs/by-name/sh/sharing/package.nix index dcad6dd71b16..185080b2c5da 100644 --- a/pkgs/by-name/sh/sharing/package.nix +++ b/pkgs/by-name/sh/sharing/package.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { # The prepack script runs the build script, which we'd rather do in the build phase. npmPackFlags = [ "--ignore-scripts" ]; - NODE_OPTIONS = "--openssl-legacy-provider"; + env.NODE_OPTIONS = "--openssl-legacy-provider"; meta = { description = "Command-line tool to share directories and files to mobile devices"; From 1dc69c1a46463a4921698a664f275758be96d0c7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:41 +0100 Subject: [PATCH 24/26] squeezelite: move env variable(s) into env for structuredAttrs --- pkgs/by-name/sq/squeezelite/package.nix | 40 +++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sq/squeezelite/package.nix b/pkgs/by-name/sq/squeezelite/package.nix index 46a973d744d3..38d6f1cd6c56 100644 --- a/pkgs/by-name/sq/squeezelite/package.nix +++ b/pkgs/by-name/sq/squeezelite/package.nix @@ -72,23 +72,31 @@ stdenv.mkDerivation { --replace "" "" ''; - EXECUTABLE = binName; + env = { + EXECUTABLE = binName; - OPTS = [ - "-DLINKALL" - "-DGPIO" - ] - ++ optional dsdSupport "-DDSD" - ++ optional (!faad2Support) "-DNO_FAAD" - ++ optional ffmpegSupport "-DFFMPEG" - ++ optional opusSupport "-DOPUS" - ++ optional portaudioSupport "-DPORTAUDIO" - ++ optional pulseSupport "-DPULSEAUDIO" - ++ optional resampleSupport "-DRESAMPLE" - ++ optional sslSupport "-DUSE_SSL" - ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) "-DRPI"; - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { LDADD = "-lportaudio -lpthread"; }; + OPTS = toString ( + [ + "-DLINKALL" + "-DGPIO" + ] + ++ optional dsdSupport "-DDSD" + ++ optional (!faad2Support) "-DNO_FAAD" + ++ optional ffmpegSupport "-DFFMPEG" + ++ optional opusSupport "-DOPUS" + ++ optional portaudioSupport "-DPORTAUDIO" + ++ optional pulseSupport "-DPULSEAUDIO" + ++ optional resampleSupport "-DRESAMPLE" + ++ optional sslSupport "-DUSE_SSL" + ++ optional (stdenv.hostPlatform.isAarch32 or stdenv.hostPlatform.isAarch64) "-DRPI" + ); + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + LDADD = toString [ + "-lportaudio" + "-lpthread" + ]; + }; installPhase = '' runHook preInstall From 15d2cbfba7319718bd4cb7cb31537dc632571eb4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Feb 2026 11:01:42 +0100 Subject: [PATCH 25/26] stalwart: move env variable(s) into env for structuredAttrs --- pkgs/by-name/st/stalwart/webadmin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/st/stalwart/webadmin.nix b/pkgs/by-name/st/stalwart/webadmin.nix index d62ee5258c28..323a4833303a 100644 --- a/pkgs/by-name/st/stalwart/webadmin.nix +++ b/pkgs/by-name/st/stalwart/webadmin.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zip ]; - NODE_PATH = "$npmDeps"; + env.NODE_PATH = "$npmDeps"; buildPhase = '' trunk build --offline --frozen --release From 7e108d8c88a36d5aab876e6e97368d31b62e9375 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 19 Feb 2026 15:55:15 +0100 Subject: [PATCH 26/26] isso: move env variable(s) into env for structuredAttrs --- pkgs/by-name/is/isso/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/is/isso/package.nix b/pkgs/by-name/is/isso/package.nix index 2b1959ae6203..cd8486a3de53 100644 --- a/pkgs/by-name/is/isso/package.nix +++ b/pkgs/by-name/is/isso/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: { npmHooks.npmConfigHook ]; - NODE_PATH = "$npmDeps"; + env.NODE_PATH = "$npmDeps"; preBuild = '' ln -s ${finalAttrs.npmDeps}/node_modules ./node_modules