nix-daemon: Remove a bunch of unnecessary environment variables
This commit is contained in:
parent
3070c88798
commit
3971876585
@ -8,6 +8,8 @@ let
|
||||
|
||||
nix = cfg.package.out;
|
||||
|
||||
isNix112 = versionAtLeast (getVersion nix) "1.12pre4997";
|
||||
|
||||
makeNixBuildUser = nr:
|
||||
{ name = "nixbld${toString nr}";
|
||||
description = "Nix build user ${toString nr}";
|
||||
@ -380,7 +382,9 @@ in
|
||||
|
||||
nix.envVars =
|
||||
{ NIX_CONF_DIR = "/etc/nix";
|
||||
}
|
||||
|
||||
// optionalAttrs (!isNix112) {
|
||||
# Enable the copy-from-other-stores substituter, which allows
|
||||
# builds to be sped up by copying build results from remote
|
||||
# Nix stores. To do this, mount the remote file system on a
|
||||
@ -390,12 +394,10 @@ in
|
||||
|
||||
// optionalAttrs cfg.distributedBuilds {
|
||||
NIX_BUILD_HOOK =
|
||||
if versionAtLeast (getVersion nix) "1.12pre4997" then
|
||||
if isNix112 then
|
||||
"${nix}/libexec/nix/build-remote"
|
||||
else
|
||||
"${nix}/libexec/nix/build-remote.pl";
|
||||
NIX_REMOTE_SYSTEMS = "/etc/nix/machines";
|
||||
NIX_CURRENT_LOAD = "/run/nix/current-load";
|
||||
};
|
||||
|
||||
# Set up the environment variables for running Nix.
|
||||
|
Loading…
Reference in New Issue
Block a user