public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nix-daemon: Remove a bunch of unnecessary environment variables

Browse Source
This commit is contained in:
Eelco Dolstra 2017-03-03 15:55:27 +01:00
parent 3070c88798
commit 3971876585
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/misc/nix-daemon.nix
View File

@ -8,6 +8,8 @@ let
nix = cfg.package.out; nix = cfg.package.out;
isNix112 = versionAtLeast (getVersion nix) "1.12pre4997";
makeNixBuildUser = nr: makeNixBuildUser = nr:
{ name = "nixbld${toString nr}"; { name = "nixbld${toString nr}";
description = "Nix build user ${toString nr}"; description = "Nix build user ${toString nr}";
@ -380,7 +382,9 @@ in
nix.envVars = nix.envVars =
{ NIX_CONF_DIR = "/etc/nix"; { NIX_CONF_DIR = "/etc/nix";
}
// optionalAttrs (!isNix112) {
# Enable the copy-from-other-stores substituter, which allows # Enable the copy-from-other-stores substituter, which allows
# builds to be sped up by copying build results from remote # builds to be sped up by copying build results from remote
# Nix stores. To do this, mount the remote file system on a # Nix stores. To do this, mount the remote file system on a
@ -390,12 +394,10 @@ in
// optionalAttrs cfg.distributedBuilds { // optionalAttrs cfg.distributedBuilds {
NIX_BUILD_HOOK = NIX_BUILD_HOOK =
if versionAtLeast (getVersion nix) "1.12pre4997" then if isNix112 then
"${nix}/libexec/nix/build-remote" "${nix}/libexec/nix/build-remote"
else else
"${nix}/libexec/nix/build-remote.pl"; "${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. # Set up the environment variables for running Nix.