diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-10 15:48:14 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-10 15:48:14 +0000 |
| commit | 8ba089597fa19bfd49ba5f22a5e821740ca4eb5d (patch) | |
| tree | b4f2299b9c973ef7636f8ce1bab0299dee4cc389 /src/nix/add-to-store.cc | |
| parent | 13b6b645897fd2edaa0f09fa48d6fe8dd6287b55 (diff) | |
| parent | 4d98143914120d0163f5c50f30ce8a5289433f8f (diff) | |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/nix/add-to-store.cc')
| -rw-r--r-- | src/nix/add-to-store.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index ab2b62da2..c2494dc9f 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -32,7 +32,7 @@ struct CmdAddToStore : MixDryRun, StoreCommand StringSink sink; dumpPath(path, sink); - auto narHash = hashString(htSHA256, *sink.s); + auto narHash = hashString(htSHA256, sink.s); Hash hash = narHash; if (ingestionMethod == FileIngestionMethod::Flat) { @@ -55,10 +55,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand }, narHash, }; - info.narSize = sink.s->size(); + info.narSize = sink.s.size(); if (!dryRun) { - auto source = StringSource { *sink.s }; + auto source = StringSource(sink.s); store->addToStore(info, source); } |