diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-18 14:36:44 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-18 14:36:44 +0000 |
| commit | 950ddfdb823891136043ae22dce0c66424c57b9d (patch) | |
| tree | 0c7adf760042911b5631125a22fc8d53fe19ca0d /src/nix/add-to-store.cc | |
| parent | 9357512d7379337c3636fa495ad7b4bbe3d8266d (diff) | |
| parent | 1c8b550e34414d0f4cb0fa20322a2dfe06ce2de0 (diff) | |
Merge remote-tracking branch 'upstream/master' into derivation-header-include-order
Diffstat (limited to 'src/nix/add-to-store.cc')
| -rw-r--r-- | src/nix/add-to-store.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index e183cb8b5..713155840 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -60,8 +60,10 @@ struct CmdAddToStore : MixDryRun, StoreCommand hash = hsink.finish().first; } - ValidPathInfo info(store->makeFixedOutputPath(ingestionMethod, hash, *namePart)); - info.narHash = narHash; + ValidPathInfo info { + store->makeFixedOutputPath(ingestionMethod, hash, *namePart), + narHash, + }; info.narSize = sink.s->size(); info.ca = std::optional { FixedOutputHash { .method = ingestionMethod, |