Merge pull request #1343 from obsidiansystems/default-machine-file-features
Use `StoreConfig::getDefaultSystemFeatures` for default machine config
This commit is contained in:
commit
cc50fdff6f
|
@ -15,6 +15,7 @@
|
|||
#include "state.hh"
|
||||
#include "hydra-build-result.hh"
|
||||
#include "store-api.hh"
|
||||
#include "local-store.hh"
|
||||
#include "remote-store.hh"
|
||||
|
||||
#include "globals.hh"
|
||||
|
@ -226,7 +227,7 @@ void State::monitorMachinesFile()
|
|||
parseMachines("localhost " +
|
||||
(settings.thisSystem == "x86_64-linux" ? "x86_64-linux,i686-linux" : settings.thisSystem.get())
|
||||
+ " - " + std::to_string(settings.maxBuildJobs) + " 1 "
|
||||
+ concatStringsSep(",", settings.systemFeatures.get()));
|
||||
+ concatStringsSep(",", (LocalStoreConfig { {} }).getDefaultSystemFeatures()));
|
||||
machinesReadyLock.unlock();
|
||||
return;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue