1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 21:01:16 +02:00

Replace $NIX_REMOTE_SYSTEMS with an option "builder-files"

Also, to unify with hydra-queue-runner, allow it to be a list of
files.
This commit is contained in:
Eelco Dolstra 2017-05-02 14:36:59 +02:00
parent cd4d2705ec
commit 7f6837a0f6
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 34 additions and 14 deletions

View file

@ -43,6 +43,10 @@ Settings::Settings()
lockCPU = getEnv("NIX_AFFINITY_HACK", "1") == "1";
caFile = getEnv("NIX_SSL_CERT_FILE", getEnv("SSL_CERT_FILE", "/etc/ssl/certs/ca-certificates.crt"));
/* Backwards compatibility. */
auto s = getEnv("NIX_REMOTE_SYSTEMS");
if (s != "") builderFiles = tokenizeString<Strings>(s, ":");
#if __linux__
sandboxPaths = tokenizeString<StringSet>("/bin/sh=" BASH_PATH);
#endif