diff options
author | eldritch horrors <pennae@lix.systems> | 2024-03-04 04:30:34 +0100 |
---|---|---|
committer | eldritch horrors <pennae@lix.systems> | 2024-03-04 04:37:03 +0100 |
commit | aeb803de9ad3cd449f7dc85588430ed5b21503eb (patch) | |
tree | 2c53d43da21c63a2dbad98bd9691e89abba91f3d /src | |
parent | 6897e238bd0c730af224b928ec8746781df67ad2 (diff) |
Merge pull request #8047 from lovesegfault/always-allow-substitutes
feat: add always-allow-substitutes
(cherry picked from commit da2b59a08878b3c6c7074595e3b6d26b6928b4c1)
Change-Id: I50481cd8fe643c673c610fec28bad84519a4d650
Diffstat (limited to 'src')
-rw-r--r-- | src/libstore/globals.hh | 8 | ||||
-rw-r--r-- | src/libstore/parsed-derivations.cc | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index dba7d78ef..229f1a96a 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -261,6 +261,14 @@ public: For the exact format and examples, see [the manual chapter on remote builds](../advanced-topics/distributed-builds.md) )"}; + Setting<bool> alwaysAllowSubstitutes{ + this, false, "always-allow-substitutes", + R"( + If set to `true`, Nix will ignore the `allowSubstitutes` attribute in + derivations and always attempt to use available substituters. + For more information on `allowSubstitutes`, see [the manual chapter on advanced attributes](../language/advanced-attributes.md). + )"}; + Setting<bool> buildersUseSubstitutes{ this, false, "builders-use-substitutes", R"( diff --git a/src/libstore/parsed-derivations.cc b/src/libstore/parsed-derivations.cc index cc4a94fab..1d900c272 100644 --- a/src/libstore/parsed-derivations.cc +++ b/src/libstore/parsed-derivations.cc @@ -122,7 +122,7 @@ bool ParsedDerivation::willBuildLocally(Store & localStore) const bool ParsedDerivation::substitutesAllowed() const { - return getBoolAttr("allowSubstitutes", true); + return settings.alwaysAllowSubstitutes ? true : getBoolAttr("allowSubstitutes", true); } bool ParsedDerivation::useUidRange() const |