aboutsummaryrefslogtreecommitdiff
path: root/src/libstore
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-09-28 15:43:56 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-09-28 15:43:56 +0000
commit80e335bb5837d7bfbf1f14d4f3d39525013c4f4d (patch)
tree367eb342462bef384b6c6abb938685530e959995 /src/libstore
parent10202bbf29128a5ef639388e4613111104385955 (diff)
Use `drvPath2` and give it a better name
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/build.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 0a6f2ccb5..0499273a4 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4315,19 +4315,19 @@ void DerivationGoal::registerOutputs()
but it's fine to do in all cases. */
bool isCaFloating = drv->type() == DerivationType::CAFloating;
- auto drvPath2 = drvPath;
+ auto drvPathResolved = drvPath;
if (!useDerivation && isCaFloating) {
/* Once a floating CA derivations reaches this point, it
must already be resolved, so we don't bother trying to
downcast drv to get would would just be an empty
inputDrvs field. */
Derivation drv2 { *drv };
- drvPath2 = writeDerivation(worker.store, drv2);
+ drvPathResolved = writeDerivation(worker.store, drv2);
}
if (useDerivation || isCaFloating)
for (auto & [outputName, newInfo] : infos)
- worker.store.linkDeriverToPath(drvPath, outputName, newInfo.path);
+ worker.store.linkDeriverToPath(drvPathResolved, outputName, newInfo.path);
}