Unverified Commit 4c212f6b authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #55779: only set __darwinAllowLocalNetworking on darwin 

... into staging.
parents e1895a52 7ec53a93

pkgs/stdenv/generic/make-derivation.nix

+3 −0
Original line number Diff line number Diff line
@@ -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 ];