lix-project/lix-releng-staging
0
0
Fork 0
Code Packages Activity

* Fix importing of derivation outputs.

Browse source
This commit is contained in:
Eelco Dolstra 2006-11-03 16:17:39 +00:00
parent b3f916995a
commit 7e85a2af5f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/primops.cc
View file

@ -43,8 +43,15 @@ static Expr primImport(EvalState & state, const ATermVector & args)
{
PathSet context;
Path path = coerceToPath(state, args[0], context);
/* !!! build the derivations in context */
for (PathSet::iterator i = context.begin(); i != context.end(); ++i) {
assert(isStorePath(*i));
if (!isValidPath(*i))
throw EvalError(format("cannot import `%1%', since path `%2%' is not valid")
% path % *i);
if (isDerivation(*i))
buildDerivations(singleton<PathSet>(*i));
}
return evalFile(state, path);
}