From 72d71dd641b01ffe20b8dec2f4e595e2b08c095f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 2 May 2023 22:24:57 +0100 Subject: [PATCH] stdenv: do not pass `__contentAddressed = false` as environment variable `nix-2.4+` automatically filters `__contentAddressed` out of the environment. But not `nix-2.3`. This make `.drv` to differ between unset and `__contentAddressed = false` derivations. This change makes them equal by filtering out `__contentAddressed` unless it's set to `true`. --- pkgs/stdenv/generic/make-derivation.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index d34785dca945..0515494ec982 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -294,6 +294,7 @@ else let (["meta" "passthru" "pos" "checkInputs" "installCheckInputs" "nativeCheckInputs" "nativeInstallCheckInputs" + "__contentAddressed" "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]