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

* Remove Nix's dependencies from the chroot. Nix 1.0 doesn't need

Browse Source 
this anymore.

svn path=/nixos/trunk/; revision=34113
This commit is contained in:
Eelco Dolstra 2012-05-15 16:12:22 +00:00
parent 560262dae0
commit dbf5e3229e
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/services/misc/nix-daemon.nix
View File

@ -170,7 +170,7 @@ in
envVars = mkOption { envVars = mkOption {
internal = true; internal = true;
default = ""; default = "";
type = with pkgs.lib.types; string; type = types.string;
description = " description = "
Environment variables used by Nix. Environment variables used by Nix.
"; ";
@ -207,15 +207,9 @@ in
# in `build-chroot-dirs' - otherwise any builder that uses # in `build-chroot-dirs' - otherwise any builder that uses
# /bin/sh won't work. # /bin/sh won't work.
binshDeps = pkgs.writeReferencesToFile config.system.build.binsh; 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 in
pkgs.runCommand "nix.conf" {extraOptions = config.nix.extraOptions; } '' 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 cat > $out <<END
# WARNING: this file is generated. # WARNING: this file is generated.
build-users-group = nixbld build-users-group = nixbld
@ -302,7 +296,7 @@ in
export ftp_proxy=${config.nix.proxy} 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" ] system.activationScripts.nix = stringAfter [ "etc" "users" ]
'' ''