nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-03 18:54:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

make-derivation.nix: Float out constant removedOrReplacedAttrs

Browse Source
This commit is contained in:
Robert Hensing 2024-03-12 16:47:02 +01:00
parent 00db4509b8
commit 37f76fd4c3
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/stdenv/generic/make-derivation.nix
View File

@ -130,6 +130,15 @@ let
"zerocallusedregs" "zerocallusedregs"
]; ];
removedOrReplacedAttrs = [
"checkInputs" "installCheckInputs"
"nativeCheckInputs" "nativeInstallCheckInputs"
"__contentAddressed"
"__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"
];
# Subset of argument, matching mkDerivation below # Subset of argument, matching mkDerivation below
makeDerivationArgument = attrs@{ makeDerivationArgument = attrs@{
separateDebugInfo ? false, separateDebugInfo ? false,
@ -291,14 +300,7 @@ let
dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC; dontAddHostSuffix = attrs ? outputHash && !noNonNativeDeps || !stdenv.hasCC;
in in
(removeAttrs attrs (removeAttrs attrs removedOrReplacedAttrs)
[
"checkInputs" "installCheckInputs"
"nativeCheckInputs" "nativeInstallCheckInputs"
"__contentAddressed"
"__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"])
// (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { // (optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) {
name = name =
let let