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

Merge #55779: only set __darwinAllowLocalNetworking on darwin

Browse Source 
... into staging.
This commit is contained in:
Vladimír Čunát 2019-02-22 11:27:28 +01:00
commit 4c212f6b12
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,7 @@ rec {
else builtins.unsafeGetAttrPos "name" attrs) else builtins.unsafeGetAttrPos "name" attrs)
, separateDebugInfo ? false , separateDebugInfo ? false
, outputs ? [ "out" ] , outputs ? [ "out" ]
, __darwinAllowLocalNetworking ? false
, __impureHostDeps ? [] , __impureHostDeps ? []
, __propagatedImpureHostDeps ? [] , __propagatedImpureHostDeps ? []
, sandboxProfile ? "" , sandboxProfile ? ""
@ -175,6 +176,7 @@ rec {
(removeAttrs attrs (removeAttrs attrs
["meta" "passthru" "pos" ["meta" "passthru" "pos"
"checkInputs" "installCheckInputs" "checkInputs" "installCheckInputs"
"__darwinAllowLocalNetworking"
"__impureHostDeps" "__propagatedImpureHostDeps" "__impureHostDeps" "__propagatedImpureHostDeps"
"sandboxProfile" "propagatedSandboxProfile"]) "sandboxProfile" "propagatedSandboxProfile"])
// (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) { // (lib.optionalAttrs (!(attrs ? name) && attrs ? pname && attrs ? version)) {
@ -245,6 +247,7 @@ rec {
} // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
NIX_HARDENING_ENABLE = enabledHardeningOptions; NIX_HARDENING_ENABLE = enabledHardeningOptions;
} // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) { } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
inherit __darwinAllowLocalNetworking;
# TODO: remove lib.unique once nix has a list canonicalization primitive # TODO: remove lib.unique once nix has a list canonicalization primitive
__sandboxProfile = __sandboxProfile =
let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ]; let profiles = [ stdenv.extraSandboxProfile ] ++ computedSandboxProfile ++ computedPropagatedSandboxProfile ++ [ propagatedSandboxProfile sandboxProfile ];