Skip substituters with an incompatible store directory

2 files changed, 7 insertions, 0 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 7be1571cb..9316c069e 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3132,6 +3132,11 @@ void SubstitutionGoal::tryNext()
     sub = subs.front();
     subs.pop_front();
 
+    if (sub->storeDir != worker.store.storeDir) {
+        tryNext();
+        return;
+    }
+
     try {
         // FIXME: make async
         info = sub->queryPathInfo(storePath);
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 32f4e31e0..7588d4b07 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -787,6 +787,7 @@ PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
 {
     PathSet res;
     for (auto & sub : getDefaultSubstituters()) {
+        if (sub->storeDir != storeDir) continue;
         if (!sub->wantMassQuery()) continue;
         for (auto & path : paths) {
             if (res.count(path)) continue;
@@ -804,6 +805,7 @@ void LocalStore::querySubstitutablePathInfos(const PathSet & paths,
     SubstitutablePathInfos & infos)
 {
     for (auto & sub : getDefaultSubstituters()) {
+        if (sub->storeDir != storeDir) continue;
         for (auto & path : paths) {
             if (infos.count(path)) continue;
             debug(format("checking substituter ‘%s’ for path ‘%s’")