diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-22 13:08:11 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-22 13:08:11 -0400 |
| commit | 66a62b3189c8c9b0965850e6b3c9b0fda0b50fd8 (patch) | |
| tree | 70a25a2cb1973a05559eca3134979fc8be873aca /src/nix/add-to-store.cc | |
| parent | f2a6cee334255ced72a70f527cf3c283b4586e42 (diff) | |
| parent | 965b80347e97169f266466603e29a57359c4083c (diff) | |
Merge remote-tracking branch 'origin/master' into substitute-other-storedir
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 7abb82556..48a4722ae 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -70,7 +70,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand ValidPathInfo info(store->makeFixedOutputPath(ingestionMethod, hash, *namePart)); info.narHash = narHash; info.narSize = sink.s->size(); - info.ca = makeFixedOutputCA(ingestionMethod, hash); + info.ca = std::optional { FixedOutputHash { + .method = ingestionMethod, + .hash = hash, + } }; if (!dryRun) { auto source = StringSource { *sink.s }; |