Merge branch 'nix-derivation-query-store-path' of https://github.com/matthewbauer/nix

This commit is contained in:
Eelco Dolstra 2021-04-22 10:29:18 +02:00
commit 78a2303b3d

View file

@ -754,10 +754,8 @@ std::set<RealisedPath> toRealisedPaths(
if (mode == Realise::Nothing) if (mode == Realise::Nothing)
settings.readOnlyMode = true; settings.readOnlyMode = true;
for (auto & i : installables) auto drvPaths = toDerivations(store, installables, true);
for (auto & b : i->toDerivedPathsWithHints()) res.insert(drvPaths.begin(), drvPaths.end());
if (auto bfd = std::get_if<DerivedPathWithHints::Built>(&b))
res.insert(bfd->drvPath);
} }
return res; return res;