From 39e27a04b8d1fc8251128b1f9f8f152b8c8a9b68 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 23 Jul 2015 09:48:03 -0400 Subject: Importing derivations: Add name attribute to make a valid drv --- src/libexpr/primops.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libexpr/primops.cc') diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index f555de73e..dd21bdc57 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -86,9 +86,11 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args if (isStorePath(path) && store->isValidPath(path) && isDerivation(path)) { Derivation drv = readDerivation(path); Value & w = *state.allocValue(); - state.mkAttrs(w, 2 + drv.outputs.size()); + state.mkAttrs(w, 3 + drv.outputs.size()); Value * v2 = state.allocAttr(w, state.sDrvPath); mkString(*v2, path, singleton("=" + path)); + v2 = state.allocAttr(w, state.sName); + mkString(*v2, drv.env["name"]); Value * outputsVal = state.allocAttr(w, state.symbols.create("outputs")); state.mkList(*outputsVal, drv.outputs.size()); -- cgit v1.2.3