diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-23 17:03:10 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-23 17:03:37 +0000 |
| commit | 98e5d1af03d1045ec1874c94b88cc21a727e28f2 (patch) | |
| tree | 46a426c84272d8118d3d7757986996cb9a565a81 /src/nix/add-to-store.cc | |
| parent | 3dc10f73931d6eaa41e28a4d763a2dc3965fd6c3 (diff) | |
| parent | 015e1c2131de938d61fa50c8df9d3987c42bcb39 (diff) | |
Merge remote-tracking branch 'upstream/master' into hash-always-has-type
Diffstat (limited to 'src/nix/add-to-store.cc')
| -rw-r--r-- | src/nix/add-to-store.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index 0dda2af38..de68e9501 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -48,7 +48,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand ValidPathInfo info(store->makeFixedOutputPath(FileIngestionMethod::Recursive, narHash, *namePart)); *info.narHash = narHash; info.narSize = sink.s->size(); - info.ca = makeFixedOutputCA(FileIngestionMethod::Recursive, *info.narHash); + info.ca = std::optional { FixedOutputHash { + .method = FileIngestionMethod::Recursive, + .hash = *info.narHash, + } }; if (!dryRun) { auto source = StringSource { *sink.s }; |