Merge pull request #3434 from Ericson2314/derivation-header-include-order

Revise division of labor in deserialization of derivations
2020-08-27 16:39:28 +02:00
parent e915fd6d2a 950ddfdb82
commit eb75282b8d
7 changed files with 41 additions and 48 deletions
@@ -101,7 +101,7 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
    };
    if (auto optStorePath = isValidDerivationInStore()) {
        auto storePath = *optStorePath;
-        Derivation drv = readDerivation(*state.store, realPath, Derivation::nameFromPath(storePath));
+        Derivation drv = state.store->readDerivation(storePath);
        Value & w = *state.allocValue();
        state.mkAttrs(w, 3 + drv.outputs.size());
        Value * v2 = state.allocAttr(w, state.sDrvPath);