nix-daemon: Remove a bunch of unnecessary environment variables

(cherry picked from commit 3971876)
NixOS · Mar 6, 2017 · 17f6e7b · 17f6e7b
1 parent 630e380
commit 17f6e7b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
@@ -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.