Rename /etc/nix.machines to /etc/nix/machines
Since we have a /etc/nix directory, we should use it and not pollute /etc.
This commit is contained in:
parent
16cd8b039b
commit
e0db0aaa4d
|
@ -249,7 +249,7 @@ in
|
||||||
|
|
||||||
# List of machines for distributed Nix builds in the format
|
# List of machines for distributed Nix builds in the format
|
||||||
# expected by build-remote.pl.
|
# expected by build-remote.pl.
|
||||||
environment.etc."nix.machines" =
|
environment.etc."nix/machines" =
|
||||||
{ enable = cfg.buildMachines != [];
|
{ enable = cfg.buildMachines != [];
|
||||||
text =
|
text =
|
||||||
concatMapStrings (machine:
|
concatMapStrings (machine:
|
||||||
|
@ -294,17 +294,17 @@ in
|
||||||
nix.envVars =
|
nix.envVars =
|
||||||
{ NIX_CONF_DIR = "/etc/nix";
|
{ NIX_CONF_DIR = "/etc/nix";
|
||||||
|
|
||||||
# Enable the copy-from-other-stores substituter, which allows builds
|
# Enable the copy-from-other-stores substituter, which allows
|
||||||
# to be sped up by copying build results from remote Nix stores. To
|
# builds to be sped up by copying build results from remote
|
||||||
# do this, mount the remote file system on a subdirectory of
|
# Nix stores. To do this, mount the remote file system on a
|
||||||
# /var/run/nix/remote-stores.
|
# subdirectory of /run/nix/remote-stores.
|
||||||
NIX_OTHER_STORES = "/var/run/nix/remote-stores/*/nix";
|
NIX_OTHER_STORES = "/run/nix/remote-stores/*/nix";
|
||||||
}
|
}
|
||||||
|
|
||||||
// optionalAttrs cfg.distributedBuilds {
|
// optionalAttrs cfg.distributedBuilds {
|
||||||
NIX_BUILD_HOOK = "${config.environment.nix}/libexec/nix/build-remote.pl";
|
NIX_BUILD_HOOK = "${config.environment.nix}/libexec/nix/build-remote.pl";
|
||||||
NIX_REMOTE_SYSTEMS = "/etc/nix.machines";
|
NIX_REMOTE_SYSTEMS = "/etc/nix/machines";
|
||||||
NIX_CURRENT_LOAD = "/var/run/nix/current-load";
|
NIX_CURRENT_LOAD = "/run/nix/current-load";
|
||||||
}
|
}
|
||||||
|
|
||||||
# !!! These should not be defined here, but in some general proxy configuration module!
|
# !!! These should not be defined here, but in some general proxy configuration module!
|
||||||
|
|
Loading…
Reference in a new issue