diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 18:43:11 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2024-03-12 18:43:11 +0100 |
| commit | 797ad5ae87786ba0911d0d2f9ce4cc9ec0cdb7ac (patch) | |
| tree | b7e945d950b3b5ad4ce17f011a39c345f4b6ae92 /pkgs/stdenv/generic | |
| parent | cac23248b1f873d10f4604b0f0facea81987367b (diff) | |
make-derivation.nix: Float out new constant removedOrReplacedAttrNames
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b86cfd1f59276..3ada1f6ec973b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -124,6 +124,15 @@ let "zerocallusedregs" ]; + removedOrReplacedAttrNames = [ + "checkInputs" "installCheckInputs" + "nativeCheckInputs" "nativeInstallCheckInputs" + "__contentAddressed" + "__darwinAllowLocalNetworking" + "__impureHostDeps" "__propagatedImpureHostDeps" + "sandboxProfile" "propagatedSandboxProfile" + ]; + makeDerivationArgument = @@ -316,13 +325,7 @@ else let ]; derivationArg = - removeAttrs attrs [ - "checkInputs" "installCheckInputs" - "nativeCheckInputs" "nativeInstallCheckInputs" - "__contentAddressed" - "__darwinAllowLocalNetworking" - "__impureHostDeps" "__propagatedImpureHostDeps" - "sandboxProfile" "propagatedSandboxProfile"] + removeAttrs attrs removedOrReplacedAttrNames // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { name = let |