From 1f9cb06db23f357f06404969820be1d3d4118a18 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 2 Jul 2020 10:59:24 -0400
Subject: [PATCH] Try next when no ca exists and have different store dirs

---
 src/libstore/build.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 95280ef1e..20d3c7387 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4421,6 +4421,9 @@ void SubstitutionGoal::tryNext()
         subPath = sub->makeFixedOutputPathFromCA(storePath.name(), *ca);
         if (sub->storeDir == worker.store.storeDir)
             assert(subPath == storePath);
+    } else if (sub->storeDir != worker.store.storeDir) {
+        tryNext();
+        return;
     }
 
     try {