* Fix importing of derivation outputs.
This commit is contained in:
parent
b3f916995a
commit
7e85a2af5f
1 changed files with 9 additions and 2 deletions
|
@ -44,7 +44,14 @@ 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);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue