Use system-features from the Nix conf in the default machine file

Fix #936
2021-04-28 11:43:04 +02:00
parent d58b3274f9
commit abff212d06
4 changed files with 42 additions and 1 deletions
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@ -156,7 +156,8 @@ void State::monitorMachinesFile()
    if (machinesFiles.empty()) {
        parseMachines("localhost " +
            (settings.thisSystem == "x86_64-linux" ? "x86_64-linux,i686-linux" : settings.thisSystem.get())
-            + " - " + std::to_string(settings.maxBuildJobs) + " 1");
+            + " - " + std::to_string(settings.maxBuildJobs) + " 1 "
+            + concatStringsSep(",", settings.systemFeatures.get()));
        return;
    }