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

Revert "Make nix shell fallback to static outputs when needed"

Browse source 
This reverts commit 8d66f5f110.

This fix isn't needed anymore now that the realisations are always
properly registered
This commit is contained in:
regnat 2021-04-23 09:34:43 +02:00
parent 6ea9c65aec
commit d3df747cb6
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/libcmd/installables.cc
View file

@ -736,18 +736,9 @@ std::set<RealisedPath> toRealisedPaths(
output.first); output.first);
auto outputId = DrvOutput{outputHashes.at(output.first), output.first}; auto outputId = DrvOutput{outputHashes.at(output.first), output.first};
auto realisation = store->queryRealisation(outputId); auto realisation = store->queryRealisation(outputId);
if (!realisation) { if (!realisation)
// TODO: remove this check once #4725 is fixed throw Error("cannot operate on an output of unbuilt content-addresed derivation '%s'", outputId.to_string());
// as we’ll have the guaranty that if res.insert(RealisedPath{*realisation});
// `output.second` exists, then the realisation
// will be there too
if (output.second)
res.insert(*output.second);
else
throw Error("cannot operate on an output of unbuilt content-addresed derivation '%s'", outputId.to_string());
} else {
res.insert(RealisedPath{*realisation});
}
} }
else { else {
// If ca-derivations isn't enabled, behave as if // If ca-derivations isn't enabled, behave as if