From 4540e7b940ca56db821fe7c7d7d79fafa488f55e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 23 Jan 2023 12:58:11 -0500
Subject: Don't add `StorePathDescriptor` for now

We don't need it yet, we can add it back later.
---
 src/libstore/local-store.cc | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

(limited to 'src/libstore/local-store.cc')

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 2d03d2d8b..e55ccab84 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1136,10 +1136,9 @@ void LocalStore::querySubstitutablePathInfos(const StorePathCAMap & paths, Subst
 
             // Recompute store path so that we can use a different store root.
             if (path.second) {
-                subPath = makeFixedOutputPathFromCA({
-                    .name = std::string { path.first.name() },
-                    .info = caWithoutRefs(*path.second),
-                });
+                subPath = makeFixedOutputPathFromCA(
+                    path.first.name(),
+                    caWithoutRefs(*path.second));
                 if (sub->storeDir == storeDir)
                     assert(subPath == path.first);
                 if (subPath != path.first)
@@ -1417,21 +1416,18 @@ StorePath LocalStore::addToStoreFromDump(Source & source0, std::string_view name
 
     auto [hash, size] = hashSink->finish();
 
-    auto desc = StorePathDescriptor {
-        std::string { name },
-        FixedOutputInfo {
-            {
-                .method = method,
-                .hash = hash,
-            },
-            .references = {
-                .others = references,
-                .self = false,
-            },
+    ContentAddressWithReferences desc = FixedOutputInfo {
+        {
+            .method = method,
+            .hash = hash,
+        },
+        .references = {
+            .others = references,
+            .self = false,
         },
     };
 
-    auto dstPath = makeFixedOutputPathFromCA(desc);
+    auto dstPath = makeFixedOutputPathFromCA(name, desc);
 
     addTempRoot(dstPath);
 
@@ -1475,7 +1471,12 @@ StorePath LocalStore::addToStoreFromDump(Source & source0, std::string_view name
 
             optimisePath(realPath, repair);
 
-            ValidPathInfo info { *this, std::move(desc), narHash.first };
+            ValidPathInfo info {
+                *this,
+                name,
+                std::move(desc),
+                narHash.first
+            };
             info.narSize = narHash.second;
             registerValidPath(info);
         }
-- 
cgit v1.2.3