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

* Recurse into attribute sets and lists when getting derivations from

Browse source 
an expression.
This commit is contained in:
Eelco Dolstra 2004-04-21 09:37:37 +00:00
parent 7cce0c34e1
commit 8e459d919d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix-env/main.cc
View file

@ -89,6 +89,8 @@ bool parseDerivations(EvalState & state, Expr e, DrvInfos & drvs)
debug(format("evaluating attribute `%1%'") % *i); debug(format("evaluating attribute `%1%'") % *i);
if (parseDerivation(state, drvMap.get(*i), drv)) if (parseDerivation(state, drvMap.get(*i), drv))
drvs[drv.drvPath] = drv; drvs[drv.drvPath] = drv;
else
parseDerivations(state, drvMap.get(*i), drvs);
} }
} }
@ -97,6 +99,8 @@ bool parseDerivations(EvalState & state, Expr e, DrvInfos & drvs)
debug(format("evaluating list element")); debug(format("evaluating list element"));
if (parseDerivation(state, *i, drv)) if (parseDerivation(state, *i, drv))
drvs[drv.drvPath] = drv; drvs[drv.drvPath] = drv;
else
parseDerivations(state, *i, drvs);
} }
} }