From 1b1e0760335832c87516b9103b670b34662d5daf Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Tue, 8 Dec 2020 11:11:02 +0100
Subject: [PATCH] Re-query for the derivation outputs in the post-build-hook

We can't assume that the runtime state knows about them as they might have
been built remotely, in which case we must query the db again to get
them.
---
 src/libstore/build/derivation-goal.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index 1db85bd37..fdf777c27 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -899,8 +899,10 @@ void DerivationGoal::buildDone()
                 Logger::Fields{worker.store.printStorePath(drvPath)});
             PushActivity pact(act.id);
             StorePathSet outputPaths;
-            for (auto i : drv->outputs) {
-                outputPaths.insert(finalOutputs.at(i.first));
+            for (auto& [_, maybeOutPath] :
+                 worker.store.queryPartialDerivationOutputMap(drvPath)) {
+                if (maybeOutPath)
+                    outputPaths.insert(*maybeOutPath);
             }
             std::map<std::string, std::string> hookEnvironment = getEnv();