From dbf5e3229ef5957a08f38c5881895f504966b66c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 15 May 2012 16:12:22 +0000
Subject: [PATCH] * Remove Nix's dependencies from the chroot.  Nix 1.0 doesn't
 need   this anymore.

svn path=/nixos/trunk/; revision=34113
---
 modules/services/misc/nix-daemon.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index be699d693fd8..7c4da0c94057 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -170,7 +170,7 @@ in
       envVars = mkOption {
         internal = true;
         default = "";
-        type = with pkgs.lib.types; string;
+        type = types.string;
         description = "
           Environment variables used by Nix.
         ";
@@ -207,15 +207,9 @@ in
               # in `build-chroot-dirs' - otherwise any builder that uses
               # /bin/sh won't work.
               binshDeps = pkgs.writeReferencesToFile config.system.build.binsh;
-
-              # Likewise, if chroots are turned on, we need Nix's own
-              # closure in the chroot.  Otherwise nix-channel and nix-env
-              # won't work because the dependencies of its builders (like
-              # coreutils and Perl) aren't visible.  Sigh.
-              nixDeps = pkgs.writeReferencesToFile config.environment.nix;
             in
               pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } ''
-                extraPaths=$(for i in $(cat ${binshDeps} ${nixDeps}); do if test -d $i; then echo $i; fi; done)
+                extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
                 cat > $out <<END
                 # WARNING: this file is generated.
                 build-users-group = nixbld
@@ -302,7 +296,7 @@ in
         export ftp_proxy=${config.nix.proxy}
       '';
 
-    users.extraUsers = map makeNixBuildUser (pkgs.lib.range 1 config.nix.nrBuildUsers);
+    users.extraUsers = map makeNixBuildUser (range 1 config.nix.nrBuildUsers);
 
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''