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

Make nix shell fallback to static outputs when needed

Browse source 
In case of pure input-addressed derivations, the build loop doesn't
guaranty that the realisations are stored in the db (if the output paths
are already there or can be substituted, the realisations won't be
registered). This caused `nix shell` to fail in some cases because it
was assuming that the realisations were always existing.

A better (but more involved) fix would probably to ensure that we always
register the realisations, but in the meantime this patches the surface
issue.

Fix #4721
This commit is contained in:
regnat 2021-04-21 17:33:21 +02:00
parent 8d651a1f68
commit 8d66f5f110
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libcmd/installables.cc
View file

@ -736,10 +736,19 @@ std::set<RealisedPath> toRealisedPaths(
output.first);
auto outputId = DrvOutput{outputHashes.at(output.first), output.first};
auto realisation = store->queryRealisation(outputId);
if (!realisation)
if (!realisation) {
// TODO: remove this check once #4725 is fixed
// as we’ll have the guaranty that if
// `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 {
// If ca-derivations isn't enabled, behave as if
// all the paths are opaque to keep the default