gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make-derivation.nix: Float out new constant removedOrReplacedAttrNames

Browse Source
This commit is contained in:
Robert Hensing
2024-03-12 18:43:11 +01:00
parent cac23248b1
commit 797ad5ae87
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/make-derivation.nix
+10 -7
View File
@@ -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