mirror of
https://github.com/NixOS/nix.git
synced 2025-11-12 13:36:02 +01:00
Revert "Merge pull request #14097 from obsidiansystems/light-realisation-improvements"
This reverts commitdc8c1461da, reversing changes made to28adcfda32.
This commit is contained in:
parent
7ba3ef21a6
commit
7e39ab4dc7
32 changed files with 254 additions and 423 deletions
|
|
@ -117,11 +117,10 @@ RealisedPath::Set BuiltPath::toRealisedPaths(Store & store) const
|
|||
"the derivation '%s' has unrealised output '%s' (derived-path.cc/toRealisedPaths)",
|
||||
store.printStorePath(p.drvPath->outPath()),
|
||||
outputName);
|
||||
DrvOutput key{*drvOutput, outputName};
|
||||
auto thisRealisation = store.queryRealisation(key);
|
||||
auto thisRealisation = store.queryRealisation(DrvOutput{*drvOutput, outputName});
|
||||
assert(thisRealisation); // We’ve built it, so we must
|
||||
// have the realisation
|
||||
res.insert(Realisation{*thisRealisation, std::move(key)});
|
||||
res.insert(*thisRealisation);
|
||||
} else {
|
||||
res.insert(outputPath);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue