From 69666b951ee06733ed420cb4cd408a19e42c6e43 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Tue, 26 Jan 2021 09:36:24 +0100
Subject: [PATCH] build-remote: Always register the missing outputs

It's possible that all the paths are already there, but just not
associated to the current drv output
---
 src/build-remote/build-remote.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/build-remote/build-remote.cc b/src/build-remote/build-remote.cc
index c2319a3d1..228aba35a 100644
--- a/src/build-remote/build-remote.cc
+++ b/src/build-remote/build-remote.cc
@@ -311,6 +311,13 @@ connected:
                     localStore->locksHeld.insert(store->printStorePath(path)); /* FIXME: ugly */
             copyPaths(ref<Store>(sshStore), store, missingPaths, NoRepair, NoCheckSigs, NoSubstitute);
         }
+        // XXX: Should e done as part of `copyPaths`
+        for (auto & realisation : missingRealisations) {
+            // Should hold, because if the feature isn't enabled the set
+            // of missing realisations should be empty
+            settings.requireExperimentalFeature("ca-derivations");
+            store->registerDrvOutput(realisation);
+        }
 
         return 0;
     }