aboutsummaryrefslogtreecommitdiff
path: root/src/nix/add-to-store.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-10-07 13:52:20 +0000
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-10-07 15:00:10 +0000
commitf8d562c0a7cef27c65d3cff96ad8ef384f05b331 (patch)
treeecba39f19746941564105f76e86cfa323a0bb019 /src/nix/add-to-store.cc
parentdae4409071b827a539acd0f46f91f15cfa1e1a7d (diff)
Use PathReferences more widely
Diffstat (limited to 'src/nix/add-to-store.cc')
-rw-r--r--src/nix/add-to-store.cc16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index 023ffa4ed..86616d66b 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -69,14 +69,20 @@ struct CmdAddToStore : MixDryRun, StoreCommand
}
ValidPathInfo info {
- store->makeFixedOutputPath(ingestionMethod, hash, *namePart),
+ *store,
+ StorePathDescriptor {
+ .name = *namePart,
+ .info = FixedOutputInfo {
+ {
+ .method = std::move(ingestionMethod),
+ .hash = std::move(hash),
+ },
+ {},
+ },
+ },
narHash,
};
info.narSize = sink.s->size();
- info.ca = std::optional { FixedOutputHash {
- .method = ingestionMethod,
- .hash = hash,
- } };
if (!dryRun) {
auto source = StringSource { *sink.s };