From 5b386b05f58b1ed996afe47791d85e6d20da91a2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 12 Jun 2020 14:57:45 -0500
Subject: [PATCH] Recompute storePath based on isContentAddressed

---
 src/libstore/store-api.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index afa557e16..c8dc4744f 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -581,7 +581,7 @@ void copyStorePath(ref<Store> srcStore, ref<Store> dstStore,
     uint64_t total = 0;
 
     // recompute store path on the chance dstStore does it differently
-    if (hasPrefix(info->ca, "fixed:") && info->references.empty()) {
+    if (info->isContentAddressed(*srcStore)) {
         auto info2 = make_ref<ValidPathInfo>(*info);
         FileIngestionMethod ingestionMethod { info->ca.compare(6, 2, "r:") == 0 };
         Hash hash(std::string(info->ca, ingestionMethod == FileIngestionMethod::Recursive ? 8 : 6));