From 11c97070f3d845a9313f137c41974c021429e834 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 12 Jun 2020 10:14:03 -0500
Subject: [PATCH] Fix storeDir != storeDir condition

this needs to only continue if the path replacement fails.
---
 src/libstore/local-store.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 6385453cc..4cecf0992 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -866,12 +866,12 @@ void LocalStore::querySubstitutablePathInfos(const StorePathSet & paths,
                 auto info = sub->queryPathInfo(path);
 
                 auto ca = pathsCA.find(printStorePath(path));
-                if (sub->storeDir != storeDir && info->references.empty() && ca != pathsCA.end()) {
+                if (info->references.empty() && ca != pathsCA.end()) {
                     if (!hasPrefix(ca->second, "fixed:"))
                         continue;
-                    // recompute store path so that we can use a fixed output ca
+                    // recompute store path so that we can use a different store path
                     path = sub->makeStorePath("output:out", hashString(htSHA256, ca->second), path.name());
-                } else continue;
+                } else if (sub->storeDir != storeDir) continue;
 
                 auto narInfo = std::dynamic_pointer_cast<const NarInfo>(
                     std::shared_ptr<const ValidPathInfo>(info));