diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-01 09:06:20 +0100 |
| commit | 2fcb11a2442b27834db87b2f62511037c31b5e36 (patch) | |
| tree | e9d38370aac7632cd35207180dc7c87d2bb6171d /pkgs/stdenv/generic | |
| parent | 456ff62ff820bbb2debd4568a775d88e61fd8bd1 (diff) | |
| parent | fc4a8f63c4e46652d484b127162641be36481363 (diff) | |
| download | nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.tar nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.gz nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.bz2 nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.lz nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.xz nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.tar.zst nixpkgs-2fcb11a2442b27834db87b2f62511037c31b5e36.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 39b84179ae0..dfb7e95113b 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -70,6 +70,7 @@ rec { else builtins.unsafeGetAttrPos "name" attrs) , separateDebugInfo ? false , outputs ? [ "out" ] + , __darwinAllowLocalNetworking ? false , __impureHostDeps ? [] , __propagatedImpureHostDeps ? [] , sandboxProfile ? "" @@ -175,6 +176,7 @@ rec { (removeAttrs attrs ["meta" "passthru" "pos" "checkInputs" "installCheckInputs" + "__darwinAllowLocalNetworking" "__impureHostDeps" "__propagatedImpureHostDeps" "sandboxProfile" "propagatedSandboxProfile"]) // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { @@ -245,6 +247,7 @@ rec { } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { NIX_HARDENING_ENABLE = enabledHardeningOptions; } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { + inherit __darwinAllowLocalNetworking; # TODO: remove lib.unique once nix has a list canonicalization primitive __sandboxProfile = let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; |