From e70789fb5a2fea7cbf45bdc68a372eb894f994f2 Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sun, 26 Apr 2026 12:25:32 -0400 Subject: [PATCH] stdenv.mkDerivation: inline variable --- pkgs/stdenv/generic/make-derivation.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index bf775db5b55b..07ac68b818ac 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -855,12 +855,12 @@ let checkedEnv = let overlappingNames = attrNames (builtins.intersectAttrs env' derivationArg); - makeError = + errors = lib.concatMapStringsSep "\n" ( name: " - ${name}: in `env`: ${lib.generators.toPretty { } env'.${name}}; in derivation arguments: ${ lib.generators.toPretty { } derivationArg.${name} - }"; - errors = lib.concatMapStringsSep "\n" makeError overlappingNames; + }" + ) overlappingNames; in assert assertMsg (isAttrs env && !isDerivation env) "`env` must be an attribute set of environment variables. Set `env.env` or pick a more specific name.";