Use nix::willBuildLocally()

2015-10-21 15:44:29 +02:00
parent 30823078c4
commit 71bf7e02d5
3 changed files with 3 additions and 11 deletions
--- a/src/hydra-queue-runner/hydra-queue-runner.cc
+++ b/src/hydra-queue-runner/hydra-queue-runner.cc
@ -21,10 +21,6 @@ State::State()
    if (hydraData == "") throw Error("$HYDRA_DATA must be set");

    logDir = canonPath(hydraData + "/build-logs");
-
-    localPlatforms = {settings.thisSystem};
-    if (settings.thisSystem == "x86_64-linux")
-        localPlatforms.insert("i686-linux");
 }


@ -97,7 +93,7 @@ void State::monitorMachinesFile()
        getEnv("NIX_REMOTE_SYSTEMS", pathExists(defaultMachinesFile) ? defaultMachinesFile : ""), ":");

    if (machinesFiles.empty()) {
-        parseMachines("localhost " + concatStringsSep(",", localPlatforms)
+        parseMachines("localhost " + settings.thisSystem
            + " - " + int2String(settings.maxBuildJobs) + " 1");
        return;
    }