wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

nix-build: Copy drv closure between eval store and build store

Browse source
This commit is contained in:
Eelco Dolstra 2021-07-16 09:37:33 +02:00
parent 2ff3035cf4
commit e9848beca7
5 changed files with 40 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/libcmd/installables.cc
View file

@ -12,7 +12,6 @@
#include "eval-cache.hh"
#include "url.hh"
#include "registry.hh"
#include "remote-store.hh"
#include <regex>
#include <queue>
@ -393,31 +392,7 @@ DerivedPaths InstallableValue::toDerivedPaths()
for (auto & i : drvsToOutputs)
res.push_back(DerivedPath::Built { i.first, i.second });
// FIXME: Temporary hack
if (state->store != state->buildStore) {
RealisedPath::Set closure;
RealisedPath::closure(*state->store, drvsToCopy, closure);
if (dynamic_cast<RemoteStore *>(&*state->buildStore)) {
StorePathSet closure2;
for (auto & p : closure)
closure2.insert(p.path());
auto valid = state->buildStore->queryValidPaths(closure2);
StorePathSet missing;
for (auto & p : closure2)
if (!valid.count(p)) missing.insert(p);
if (!missing.empty()) {
auto source = sinkToSource([&](Sink & sink) {
state->store->exportPaths(missing, sink);
});
state->buildStore->importPaths(*source, NoCheckSigs);
}
} else
copyPaths(state->store, state->buildStore, closure);
}
copyClosure(state->store, state->buildStore, drvsToCopy);
return res;
}