From 7e85a2af5f2cf6c19fc582c6cec77c0eefef2c31 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 3 Nov 2006 16:17:39 +0000 Subject: [PATCH] * Fix importing of derivation outputs. --- src/libexpr/primops.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index 0f62653b0..7776a38d6 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -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(*i)); + } return evalFile(state, path); }