Merge remote-tracking branch 'origin/master' into markdown

2020-08-31 14:24:26 +02:00
parent c3efef9275 56707218f6
commit 84f5cabbea
20 changed files with 250 additions and 111 deletions
@@ -102,7 +102,7 @@ static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vS

    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);