mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-26 07:46:21 +02:00
nix-shell: Set $IN_NIX_SHELL before evaluation
This has some hacky applications.
This commit is contained in:
parent
65a6452240
commit
0c1198cf08
1 changed files with 2 additions and 2 deletions
|
@ -175,6 +175,8 @@ foreach my $expr (@exprs) {
|
||||||
$drvPath = readlink $drvPath or die "cannot read symlink `$drvPath'" if -l $drvPath;
|
$drvPath = readlink $drvPath or die "cannot read symlink `$drvPath'" if -l $drvPath;
|
||||||
my $drv = derivationFromPath($drvPath);
|
my $drv = derivationFromPath($drvPath);
|
||||||
|
|
||||||
|
$ENV{'IN_NIX_SHELL'} = 1;
|
||||||
|
|
||||||
# Build or fetch all dependencies of the derivation.
|
# Build or fetch all dependencies of the derivation.
|
||||||
my @inputDrvs = grep { my $x = $_; (grep { $x =~ $_ } @envExclude) == 0 } @{$drv->{inputDrvs}};
|
my @inputDrvs = grep { my $x = $_; (grep { $x =~ $_ } @envExclude) == 0 } @{$drv->{inputDrvs}};
|
||||||
system("$Nix::Config::binDir/nix-store", "-r", "--no-output", @buildArgs, @inputDrvs, @{$drv->{inputSrcs}}) == 0
|
system("$Nix::Config::binDir/nix-store", "-r", "--no-output", @buildArgs, @inputDrvs, @{$drv->{inputSrcs}}) == 0
|
||||||
|
@ -193,8 +195,6 @@ foreach my $expr (@exprs) {
|
||||||
$ENV{'NIX_STORE'} = $Nix::Config::storeDir;
|
$ENV{'NIX_STORE'} = $Nix::Config::storeDir;
|
||||||
$ENV{$_} = $drv->{env}->{$_} foreach keys %{$drv->{env}};
|
$ENV{$_} = $drv->{env}->{$_} foreach keys %{$drv->{env}};
|
||||||
|
|
||||||
$ENV{'IN_NIX_SHELL'} = 1;
|
|
||||||
|
|
||||||
# Run a shell using the derivation's environment. For
|
# Run a shell using the derivation's environment. For
|
||||||
# convenience, source $stdenv/setup to setup additional
|
# convenience, source $stdenv/setup to setup additional
|
||||||
# environment variables and shell functions. Also don't lose
|
# environment variables and shell functions. Also don't lose
|
||||||
|
|
Loading…
Reference in a new issue