From 85d01e1f658d93a0ea8d0396b1e79d03c2ff1da2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 12 Jun 2020 14:53:30 -0500
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20use=20makeStorePath?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libstore/store-api.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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