From 73b273f58ff2e8f34cb086860736ab8a13e4954f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 17 Feb 2026 13:45:49 +0100 Subject: [PATCH 1/6] ecc: move CARGO_* env vars into env for structuredAttrs --- pkgs/by-name/ca/cargo-lambda/package.nix | 2 +- pkgs/by-name/co/codebook/package.nix | 6 ++++-- pkgs/by-name/ec/ecc/package.nix | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/cargo-lambda/package.nix b/pkgs/by-name/ca/cargo-lambda/package.nix index ec87d7a95376..6d6bc5a3b780 100644 --- a/pkgs/by-name/ca/cargo-lambda/package.nix +++ b/pkgs/by-name/ca/cargo-lambda/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { wrapProgram $out/bin/cargo-lambda --prefix PATH : ${lib.makeBinPath [ zig_0_13 ]} ''; - CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; + env.CARGO_LAMBDA_BUILD_INFO = "(nixpkgs)"; cargoBuildFlags = [ "--features=skip-build-banner" ]; cargoCheckFlags = [ "--features=skip-build-banner" ]; diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index f918d785faf0..3da924bec58e 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -20,8 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/codebook-lsp"; cargoHash = "sha256-hxPgYGBq+KZfEyFiHQG31cNEN6A6hUgKRgZXIHOGalw="; - CARGO_PROFILE_RELEASE_LTO = "fat"; - CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + env = { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; # Integration tests require internet access for dictionaries doCheck = false; diff --git a/pkgs/by-name/ec/ecc/package.nix b/pkgs/by-name/ec/ecc/package.nix index 5ad96e6cd549..aee4052f8132 100644 --- a/pkgs/by-name/ec/ecc/package.nix +++ b/pkgs/by-name/ec/ecc/package.nix @@ -78,7 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { zlib ]; - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc"; + env.CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER = "gcc"; preBuild = '' # `SANDBOX` defined by upstream to disable build-time network access From c0f7d81f9ddbbfc29d63fab4040fb90ad2585e12 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 17 Feb 2026 13:45:56 +0100 Subject: [PATCH 2/6] mhost: move CARGO_* env vars into env for structuredAttrs --- pkgs/by-name/mh/mhost/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mh/mhost/package.nix b/pkgs/by-name/mh/mhost/package.nix index ef08dc884b0f..48364f3abca1 100644 --- a/pkgs/by-name/mh/mhost/package.nix +++ b/pkgs/by-name/mh/mhost/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-08pvkBa2PD7/uko1OOBg6/dCcOM3z9Cp//8mylFCMcE="; - CARGO_CRATE_NAME = "mhost"; + env.CARGO_CRATE_NAME = "mhost"; doCheck = false; From 6ea1adbff5785e54b428f4e77ccfa72eb011b7ff Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 17 Feb 2026 13:45:56 +0100 Subject: [PATCH 3/6] oha: move CARGO_* env vars into env for structuredAttrs --- pkgs/by-name/oh/oha/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 9ea88a485e73..aabfc749ac94 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -22,8 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-v+OfQEfAwHxX+FfC0UK2F8/e2tJKaI3zQpg+3hk2hV4="; - CARGO_PROFILE_RELEASE_LTO = "fat"; - CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + env = { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config From 3ae21946e536aa035e0eeea63f87e0e0b685037e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 17 Feb 2026 13:45:57 +0100 Subject: [PATCH 4/6] rutabaga_gfx: move CARGO_* env vars into env for structuredAttrs --- pkgs/by-name/ru/rutabaga_gfx/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/rutabaga_gfx/package.nix b/pkgs/by-name/ru/rutabaga_gfx/package.nix index bbd6c3ef1512..5caaa90d1ed4 100644 --- a/pkgs/by-name/ru/rutabaga_gfx/package.nix +++ b/pkgs/by-name/ru/rutabaga_gfx/package.nix @@ -58,8 +58,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonBool "gfxstream" withGfxstream) ]; - CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; - "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc"; + env = { + CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + "CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" = "${stdenv.cc.targetPrefix}cc"; + }; preConfigure = '' cd rutabaga_gfx/ffi From ce1cdecdce9e6d61fc1f4a3eed1ca7dac86a357f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 17 Feb 2026 13:45:57 +0100 Subject: [PATCH 5/6] scryer-prolog: move CARGO_* env vars into env for structuredAttrs --- pkgs/by-name/sc/scryer-prolog/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scryer-prolog/package.nix b/pkgs/by-name/sc/scryer-prolog/package.nix index 1fba7059afdd..2c3fe35fa29e 100644 --- a/pkgs/by-name/sc/scryer-prolog/package.nix +++ b/pkgs/by-name/sc/scryer-prolog/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - CARGO_FEATURE_USE_SYSTEM_LIBS = true; + env.CARGO_FEATURE_USE_SYSTEM_LIBS = true; meta = { description = "Modern Prolog implementation written mostly in Rust"; From 3465ae14714ae2c6c175d21807d4b4b47a5d7303 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 17 Feb 2026 13:45:57 +0100 Subject: [PATCH 6/6] yara-x: move CARGO_* env vars into env for structuredAttrs --- pkgs/by-name/ya/yara-x/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 2e9dac81f8c2..fe3cf78432c8 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -22,8 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-ihNFGlPhPLCIDvFnMqKA+flD/mv9wcKgQ1txO71xOp4="; - CARGO_PROFILE_RELEASE_LTO = "fat"; - CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + env = { + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + }; nativeBuildInputs = [ installShellFiles