aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-06-17 03:56:48 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-06-17 04:30:16 +0000
commit18493fd9c48676ab26854739db67ac5d76ff9347 (patch)
treec312242c7679cd4b118f08d292eb70bd362bf8a5 /src/libexpr
parent7130f0a3a6455cf27863f0bbccf0974cfcc82fa2 (diff)
Move some Store functions from derivations.cc to store-api.cc
This further continues with the dependency inverstion. Also I just went ahead and exposed `parseDerivation`: it seems like the more proper building block, and not a bad thing to expose if we are trying to be less wedded to drv files on disk anywas.
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/primops.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 907f15246..0c2371c43 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -103,7 +103,7 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
// FIXME
if (state.store->isStorePath(path) && state.store->isValidPath(state.store->parseStorePath(path)) && isDerivation(path)) {
- Derivation drv = readDerivation(*state.store, realPath);
+ Derivation drv = state.store->readDerivation(state.store->parseStorePath(path));
Value & w = *state.allocValue();
state.mkAttrs(w, 3 + drv.outputs.size());
Value * v2 = state.allocAttr(w, state.sDrvPath);