lbodor/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Use drvPath2 and give it a better name

Browse source
This commit is contained in:
John Ericson 2020-09-28 15:43:56 +00:00
parent 10202bbf29
commit 80e335bb58
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build.cc
View file

@ -4315,19 +4315,19 @@ void DerivationGoal::registerOutputs()
but it's fine to do in all cases. */ but it's fine to do in all cases. */
bool isCaFloating = drv->type() == DerivationType::CAFloating; bool isCaFloating = drv->type() == DerivationType::CAFloating;
auto drvPath2 = drvPath; auto drvPathResolved = drvPath;
if (!useDerivation && isCaFloating) { if (!useDerivation && isCaFloating) {
/* Once a floating CA derivations reaches this point, it /* Once a floating CA derivations reaches this point, it
must already be resolved, so we don't bother trying to must already be resolved, so we don't bother trying to
downcast drv to get would would just be an empty downcast drv to get would would just be an empty
inputDrvs field. */ inputDrvs field. */
Derivation drv2 { *drv }; Derivation drv2 { *drv };
drvPath2 = writeDerivation(worker.store, drv2); drvPathResolved = writeDerivation(worker.store, drv2);
} }
if (useDerivation || isCaFloating) if (useDerivation || isCaFloating)
for (auto & [outputName, newInfo] : infos) for (auto & [outputName, newInfo] : infos)
worker.store.linkDeriverToPath(drvPath, outputName, newInfo.path); worker.store.linkDeriverToPath(drvPathResolved, outputName, newInfo.path);
} }