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

Respect all outputs passed to the derivation, not just the last one

Browse source
This commit is contained in:
Shea Levy 2011-11-06 06:54:05 +00:00
parent 24b65937e1
commit ca0d47a70c
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libexpr/primops.cc
View file

@ -388,8 +388,10 @@ static void prim_derivationStrict(EvalState & state, Value * * args, Value & v)
if (!useDrvAsSrc && isDerivation(path)) if (!useDrvAsSrc && isDerivation(path))
if (explicitlyPassed) if (explicitlyPassed)
drv.inputDrvs[path] = store -> queryDerivationOutputNames(path); drv.inputDrvs[path] = store -> queryDerivationOutputNames(path);
else else if (drv.inputDrvs.find(path) == drv.inputDrvs.end())
drv.inputDrvs[path] = singleton<StringSet>(output); drv.inputDrvs[path] = singleton<StringSet>(output);
else
drv.inputDrvs[path].insert(output);
else else
drv.inputSrcs.insert(path); drv.inputSrcs.insert(path);
} }