1 files changed, 5 insertions, 0 deletions
diff --git a/guix-build-coordinator/datastore/sqlite.scm b/guix-build-coordinator/datastore/sqlite.scm
index 801f895..b4c40a6 100644
--- a/guix-build-coordinator/datastore/sqlite.scm
+++ b/guix-build-coordinator/datastore/sqlite.scm
@@ -295,6 +295,8 @@ UNION
 )
 SELECT DISTINCT related_derivations.name
 FROM related_derivations
+INNER JOIN derivations
+  ON related_derivations.name = derivations.name
 INNER JOIN derivation_outputs
   ON related_derivations.name = derivation_outputs.derivation_name
 WHERE related_derivations.name != :derivation
@@ -303,6 +305,9 @@ WHERE related_derivations.name != :derivation
     FROM derivation_outputs
     INNER JOIN builds
       ON derivation_outputs.derivation_name = builds.derivation_name
+    INNER JOIN derivations AS build_derivations
+      ON builds.derivation_name = build_derivations.name
+    WHERE build_derivations.system = derivations.system
   )
 ")))