eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #4326 from tweag/fix-post-build-hook-and-remote-builders

Browse source 
Re-query for the derivation outputs in the post-build-hook
This commit is contained in:
Eelco Dolstra 2020-12-08 11:47:47 +01:00 committed by GitHub
parent 97dc44f3d6 1b1e076033
commit 500161b970
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/build/derivation-goal.cc
View file

@ -899,8 +899,10 @@ void DerivationGoal::buildDone()
Logger::Fields{worker.store.printStorePath(drvPath)}); Logger::Fields{worker.store.printStorePath(drvPath)});
PushActivity pact(act.id); PushActivity pact(act.id);
StorePathSet outputPaths; StorePathSet outputPaths;
for (auto i : drv->outputs) { for (auto& [_, maybeOutPath] :
outputPaths.insert(finalOutputs.at(i.first)); worker.store.queryPartialDerivationOutputMap(drvPath)) {
if (maybeOutPath)
outputPaths.insert(*maybeOutPath);
} }
std::map<std::string, std::string> hookEnvironment = getEnv(); std::map<std::string, std::string> hookEnvironment = getEnv();