nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 15:02:42 +01:00
Code Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2020-11-17 13:58:55 +01:00
parent bccff827dc
commit e6b7c7b79c
4 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/local-store.cc
View file

@ -624,10 +624,7 @@ uint64_t LocalStore::addValidPath(State & state,
efficiently query whether a path is an output of some
derivation. */
if (info.path.isDerivation()) {
auto drv = parseDerivation(
*this,
readFile(Store::toRealPath(info.path)),
Derivation::nameFromPath(info.path));
auto drv = readInvalidDerivation(info.path);
/* Verify that the output paths in the derivation are correct
(i.e., follow the scheme for computing output paths from
@ -1003,10 +1000,7 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos)
if (i.path.isDerivation()) {
// FIXME: inefficient; we already loaded the derivation in addValidPath().
checkDerivationOutputs(i.path,
parseDerivation(
*this,
readFile(Store::toRealPath(i.path)),
Derivation::nameFromPath(i.path)));
readInvalidDerivation(i.path));
}
/* Do a topological sort of the paths. This will throw an