nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

nix-daemon: Remove a bunch of unnecessary environment variables

Browse Source 
(cherry picked from commit 3971876585)
This commit is contained in:
Eelco Dolstra
2017-03-03 15:55:27 +01:00
committed by Robin Gloster
parent 630e3809a1
commit 17f6e7bfde
1 changed files with 5 additions and 3 deletions
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;
isNix112 = versionAtLeast (getVersion nix) "1.12pre4997";
makeNixBuildUser = nr:
{ name = "nixbld${toString nr}";
description = "Nix build user ${toString nr}";
@@ -381,7 +383,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
@@ -391,12 +395,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.