From 20799a5151cbb185c1772b8e5160493b2dc2d0e8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 19 Jun 2020 18:41:33 +0000
Subject: WIP: Make Hash always store a valid hash type

---
 src/nix/add-to-store.cc | 4 ++--
 src/nix/develop.cc      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/nix')

diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index f43f774c1..0dda2af38 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -46,9 +46,9 @@ struct CmdAddToStore : MixDryRun, StoreCommand
         auto narHash = hashString(htSHA256, *sink.s);
 
         ValidPathInfo info(store->makeFixedOutputPath(FileIngestionMethod::Recursive, narHash, *namePart));
-        info.narHash = narHash;
+        *info.narHash = narHash;
         info.narSize = sink.s->size();
-        info.ca = makeFixedOutputCA(FileIngestionMethod::Recursive, info.narHash);
+        info.ca = makeFixedOutputCA(FileIngestionMethod::Recursive, *info.narHash);
 
         if (!dryRun) {
             auto source = StringSource { *sink.s };
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 8b85caf82..4aee9f202 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -139,7 +139,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
         .path = shellOutPath,
         .hash = DerivationOutputHash {
             .method = FileIngestionMethod::Flat,
-            .hash = Hash { },
+            .hash = Hash { htSHA256 },
         },
     });
     drv.env["out"] = store->printStorePath(shellOutPath);
-- 
cgit v1.2.3