diff --git a/nixbld-etc-nixos/nix-networked-derivations.patch b/nixbld-etc-nixos/nix-networked-derivations.patch index 80f3b96b..6827040b 100644 --- a/nixbld-etc-nixos/nix-networked-derivations.patch +++ b/nixbld-etc-nixos/nix-networked-derivations.patch @@ -1,8 +1,8 @@ diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc -index 64b55ca6a..9b4e52b8e 100644 +index 763045a80..d7c5cc82e 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc -@@ -180,6 +180,8 @@ void LocalDerivationGoal::tryLocalBuild() +@@ -190,6 +190,8 @@ void LocalDerivationGoal::tryLocalBuild() assert(derivationType); @@ -11,7 +11,7 @@ index 64b55ca6a..9b4e52b8e 100644 /* Are we doing a chroot build? */ { auto noChroot = parsedDrv->getBoolAttr("__noChroot"); -@@ -197,7 +199,7 @@ void LocalDerivationGoal::tryLocalBuild() +@@ -207,7 +209,7 @@ void LocalDerivationGoal::tryLocalBuild() else if (settings.sandboxMode == smDisabled) useChroot = false; else if (settings.sandboxMode == smRelaxed) @@ -20,7 +20,7 @@ index 64b55ca6a..9b4e52b8e 100644 } auto & localStore = getLocalStore(); -@@ -691,7 +693,7 @@ void LocalDerivationGoal::startBuilder() +@@ -717,7 +719,7 @@ void LocalDerivationGoal::startBuilder() "nogroup:x:65534:\n", sandboxGid())); /* Create /etc/hosts with localhost entry. */ @@ -29,7 +29,7 @@ index 64b55ca6a..9b4e52b8e 100644 writeFile(chrootRootDir + "/etc/hosts", "127.0.0.1 localhost\n::1 localhost\n"); /* Make the closure of the inputs available in the chroot, -@@ -895,7 +897,7 @@ void LocalDerivationGoal::startBuilder() +@@ -921,7 +923,7 @@ void LocalDerivationGoal::startBuilder() us. */ @@ -38,7 +38,7 @@ index 64b55ca6a..9b4e52b8e 100644 privateNetwork = true; userNamespaceSync.create(); -@@ -1134,7 +1136,7 @@ void LocalDerivationGoal::initEnv() +@@ -1160,7 +1162,7 @@ void LocalDerivationGoal::initEnv() to the builder is generally impure, but the output of fixed-output derivations is by definition pure (since we already know the cryptographic hash of the output). */ @@ -47,7 +47,7 @@ index 64b55ca6a..9b4e52b8e 100644 for (auto & i : parsedDrv->getStringsAttr("impureEnvVars").value_or(Strings())) env[i] = getEnv(i).value_or(""); } -@@ -1799,7 +1801,7 @@ void LocalDerivationGoal::runChild() +@@ -1829,7 +1831,7 @@ void LocalDerivationGoal::runChild() /* Fixed-output derivations typically need to access the network, so give them access to /etc/resolv.conf and so on. */ @@ -56,21 +56,21 @@ index 64b55ca6a..9b4e52b8e 100644 // Only use nss functions to resolve hosts and // services. Don’t use it for anything else that may // be configured for this system. This limits the -@@ -2050,7 +2052,7 @@ void LocalDerivationGoal::runChild() - #include "sandbox-defaults.sb" - ; +@@ -2071,7 +2073,7 @@ void LocalDerivationGoal::runChild() + #include "sandbox-defaults.sb" + ; -- if (!derivationType->isSandboxed()) -+ if (networked || !derivationType->isSandboxed()) - sandboxProfile += - #include "sandbox-network.sb" - ; +- if (!derivationType->isSandboxed()) ++ if (networked || !derivationType->isSandboxed()) + sandboxProfile += + #include "sandbox-network.sb" + ; diff --git a/src/libstore/build/local-derivation-goal.hh b/src/libstore/build/local-derivation-goal.hh -index 0a05081c7..4c251718c 100644 +index 86b86c01e..95b03aae8 100644 --- a/src/libstore/build/local-derivation-goal.hh +++ b/src/libstore/build/local-derivation-goal.hh -@@ -66,6 +66,8 @@ struct LocalDerivationGoal : public DerivationGoal - +@@ -82,6 +82,8 @@ struct LocalDerivationGoal : public DerivationGoal + */ Path chrootRootDir; + bool networked;