diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-12 16:32:36 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-12 18:13:00 +0000 |
| commit | 4720853129b6866775edd9f90ad6f10701f98a3c (patch) | |
| tree | a13e1d077c6254de55521bf9edd91749546c71b5 /src/libstore/parsed-derivations.cc | |
| parent | 574bf60b4d47f64c0b83b0cd032d34a67dbb3453 (diff) | |
Make `system-features` a store setting
This seems more correct. It also means one can specify the features a
store should support with --store and remote-store=..., which is useful.
I use this to clean up the build remotes test.
Diffstat (limited to 'src/libstore/parsed-derivations.cc')
| -rw-r--r-- | src/libstore/parsed-derivations.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/parsed-derivations.cc b/src/libstore/parsed-derivations.cc index 24f848e46..e7b7202d4 100644 --- a/src/libstore/parsed-derivations.cc +++ b/src/libstore/parsed-derivations.cc @@ -94,7 +94,7 @@ StringSet ParsedDerivation::getRequiredSystemFeatures() const return res; } -bool ParsedDerivation::canBuildLocally() const +bool ParsedDerivation::canBuildLocally(Store & localStore) const { if (drv.platform != settings.thisSystem.get() && !settings.extraPlatforms.get().count(drv.platform) @@ -102,14 +102,14 @@ bool ParsedDerivation::canBuildLocally() const return false; for (auto & feature : getRequiredSystemFeatures()) - if (!settings.systemFeatures.get().count(feature)) return false; + if (!localStore.systemFeatures.get().count(feature)) return false; return true; } -bool ParsedDerivation::willBuildLocally() const +bool ParsedDerivation::willBuildLocally(Store & localStore) const { - return getBoolAttr("preferLocalBuild") && canBuildLocally(); + return getBoolAttr("preferLocalBuild") && canBuildLocally(localStore); } bool ParsedDerivation::substitutesAllowed() const |