aboutsummaryrefslogtreecommitdiff
path: root/src/libexpr
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-05 14:49:25 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-08-05 14:49:25 +0000
commitb9ebe373bbab6f19ee650ef9769ad76c32b7244d (patch)
tree95f4f07c382bcb6af93ece988b278d9b64d2d375 /src/libexpr
parent951415b5685fe52d31770eadabd66d95ea75cfae (diff)
Sed some names to perhaps avoid conflicts
Diffstat (limited to 'src/libexpr')
-rw-r--r--src/libexpr/primops.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 784c12b16..7bc424d52 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -783,7 +783,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
auto outPath = state.store->makeFixedOutputPath(ingestionMethod, h, drvName);
if (!jsonObject) drv.env["out"] = state.store->printStorePath(outPath);
drv.outputs.insert_or_assign("out", DerivationOutput {
- .output = DerivationOutputFixed {
+ .output = DerivationOutputCAFixed {
.hash = FixedOutputHash {
.method = ingestionMethod,
.hash = std::move(h),
@@ -797,7 +797,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
for (auto & i : outputs) {
if (!jsonObject) drv.env[i] = hashPlaceholder(i);
drv.outputs.insert_or_assign(i, DerivationOutput {
- .output = DerivationOutputFloating {
+ .output = DerivationOutputCAFloating {
.method = ingestionMethod,
.hashType = std::move(ht),
},