aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr/primops.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-21 19:35:35 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-21 19:35:35 +0000
commit3a7b330b64c6ea77e18a0a96aad7fb14947382d9 (patch)
tree3edbc7fb3a4010051d64e8e678401b7ac83d560b /src/libexpr/primops.cc
parent27a3f82c0bb22692b8a9d373a10f3f237b19742f (diff)
"Downstream placeholders" should not be store paths
Insead they should be opaque `/<hash>` like the placeholders we already have.
Diffstat (limited to 'src/libexpr/primops.cc')
-rw-r--r--src/libexpr/primops.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 0ddba6384..d28024639 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -82,13 +82,13 @@ static void mkOutputString(EvalState & state, Value & v,
auto optOutputPath = o.second.pathOpt(*state.store, drv.name, o.first);
mkString(
*state.allocAttr(v, state.symbols.create(o.first)),
- state.store->printStorePath(optOutputPath
- ? *optOutputPath
+ optOutputPath
+ ? state.store->printStorePath(*optOutputPath)
/* Downstream we would substitute this for an actual path once
we build the floating CA derivation */
/* FIXME: we need to depend on the basic derivation, not
derivation */
- : downstreamPlaceholder(*state.store, drvPath, o.first)),
+ : downstreamPlaceholder(*state.store, drvPath, o.first),
{"!" + o.first + "!" + state.store->printStorePath(drvPath)});
}