Merge branch 'ca-floating-upstream' of github.com:obsidiansystems/nix into ca-floating-upstream

This commit is contained in:
John Ericson 2020-08-28 21:23:09 +00:00
commit 02e0001fc0

View file

@ -1477,8 +1477,7 @@ void DerivationGoal::inputsRealised()
}); });
auto resolvedGoal = worker.makeDerivationGoal( auto resolvedGoal = worker.makeDerivationGoal(
pathResolved, wantedOutputs, pathResolved, wantedOutputs, buildMode);
buildMode == bmRepair ? bmRepair : bmNormal);
addWaitee(resolvedGoal); addWaitee(resolvedGoal);
state = &DerivationGoal::resolvedFinished; state = &DerivationGoal::resolvedFinished;