Fix build

This commit is contained in:
Eelco Dolstra
2020-08-04 11:33:29 +02:00
parent 7b8a3acbf0
commit 7d3ba616a9
8 changed files with 51 additions and 51 deletions

View File

@ -16,7 +16,7 @@ BuildOutput getBuildOutput(
BuildOutput res;
/* Compute the closure size. */
auto outputs = drv.outputPaths();
auto outputs = drv.outputPaths(*store);
StorePathSet closure;
for (auto & output : outputs)
store->computeFSClosure(output, closure);
@ -106,10 +106,11 @@ BuildOutput getBuildOutput(
if (!explicitProducts) {
for (auto & output : drv.outputs) {
BuildProduct product;
product.path = store->printStorePath(output.second.path);
auto outPath = output.second.path(*store, drv.name);
product.path = store->printStorePath(outPath);
product.type = "nix-build";
product.subtype = output.first == "out" ? "" : output.first;
product.name = output.second.path.name();
product.name = outPath.name();
auto file = narMembers.find(product.path);
assert(file != narMembers.end());