lix-project/lix
20
58
Fork 31
Code Issues 359 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Fix nix-shell shebang scripts if -p is used

Browse source
This commit is contained in:
Eelco Dolstra 2015-02-18 12:40:07 +01:00
parent 147deb236e
commit bb10010582
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/nix-build.in
View file

@ -231,7 +231,7 @@ foreach my $expr (@exprs) {
# If we're in a #! script, interpret filenames relative to the # If we're in a #! script, interpret filenames relative to the
# script. # script.
$expr = dirname(Cwd::abs_path($script)) . "/" . $expr $expr = dirname(Cwd::abs_path($script)) . "/" . $expr
if $inShebang && $expr !~ /^\//; if $inShebang && !$packages && $expr !~ /^\//;
# !!! would prefer the perl 5.8.0 pipe open feature here. # !!! would prefer the perl 5.8.0 pipe open feature here.
my $pid = open(DRVPATHS, "-|") || exec "$Nix::Config::binDir/nix-instantiate", "--add-root", $drvLink, "--indirect", @instArgs, $expr; my $pid = open(DRVPATHS, "-|") || exec "$Nix::Config::binDir/nix-instantiate", "--add-root", $drvLink, "--indirect", @instArgs, $expr;