From de4e7067766d1e530fcd93098b05ca55481e068e Mon Sep 17 00:00:00 2001 From: Neil Mayhew Date: Sat, 8 Apr 2017 18:31:11 -0600 Subject: [PATCH] Propagate NIX_BUILD_CORES to nix-shell environments --- scripts/nix-build.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/nix-build.in b/scripts/nix-build.in index bb61e1c1..7e8acaa4 100755 --- a/scripts/nix-build.in +++ b/scripts/nix-build.in @@ -11,6 +11,8 @@ use Cwd; binmode STDERR, ":encoding(utf8)"; +Nix::Config::readConfig; + my $dryRun = 0; my $verbose = 0; my $runEnv = $0 =~ /nix-shell$/; @@ -279,6 +281,9 @@ foreach my $expr (@exprs) { } $ENV{'NIX_BUILD_TOP'} = $ENV{'TMPDIR'} = $ENV{'TEMPDIR'} = $ENV{'TMP'} = $ENV{'TEMP'} = $tmp; $ENV{'NIX_STORE'} = $Nix::Config::storeDir; + if (defined $Nix::Config::config{"build-cores"}) { + $ENV{'NIX_BUILD_CORES'} = $Nix::Config::config{"build-cores"}; + } $ENV{$_} = $drv->{env}->{$_} foreach keys %{$drv->{env}}; # Run a shell using the derivation's environment. For