nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix nix-shell for derivation with multiple outputs

Browse source 
If derivation declares multiple outputs and first (default) output
if not "out", then "nix-instantiate" calls return path with output
names appended after "!". Than suffix must be stripped before
ant path checks are done.
This commit is contained in:
Maxim Ivanov 2014-03-29 11:43:11 +00:00 committed by Eelco Dolstra
parent 1c2550a2ae
commit 59c9019685
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/nix-build.in
View file

@ -196,6 +196,7 @@ foreach my $expr (@exprs) {
if ($runEnv) { if ($runEnv) {
die "$0: a single derivation is required\n" if scalar @drvPaths != 1; die "$0: a single derivation is required\n" if scalar @drvPaths != 1;
my $drvPath = $drvPaths[0]; my $drvPath = $drvPaths[0];
$drvPath = (split '!',$drvPath)[0];
$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);