diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-23 12:58:11 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-01-23 12:58:27 -0500 |
| commit | 4540e7b940ca56db821fe7c7d7d79fafa488f55e (patch) | |
| tree | df688d2ea13f20f9225f08f90d9c327bf301d4ca /src/nix | |
| parent | c67e0cc58c5a74121d74a3f5cf9f9c2199a87093 (diff) | |
Don't add `StorePathDescriptor` for now
We don't need it yet, we can add it back later.
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/add-to-store.cc | 14 | ||||
| -rw-r--r-- | src/nix/profile.cc | 20 |
2 files changed, 15 insertions, 19 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index 0b58818c3..81dbc09a6 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -43,15 +43,13 @@ struct CmdAddToStore : MixDryRun, StoreCommand ValidPathInfo info { *store, - StorePathDescriptor { - .name = *namePart, - .info = FixedOutputInfo { - { - .method = std::move(ingestionMethod), - .hash = std::move(hash), - }, - .references = {}, + std::move(*namePart), + FixedOutputInfo { + { + .method = std::move(ingestionMethod), + .hash = std::move(hash), }, + .references = {}, }, narHash, }; diff --git a/src/nix/profile.cc b/src/nix/profile.cc index aac8e5c81..345505532 100644 --- a/src/nix/profile.cc +++ b/src/nix/profile.cc @@ -200,17 +200,15 @@ struct ProfileManifest ValidPathInfo info { *store, - StorePathDescriptor { - "profile", - FixedOutputInfo { - { - .method = FileIngestionMethod::Recursive, - .hash = narHash, - }, - .references = { - .others = std::move(references), - .self = false, - }, + "profile", + FixedOutputInfo { + { + .method = FileIngestionMethod::Recursive, + .hash = narHash, + }, + .references = { + .others = std::move(references), + .self = false, }, }, narHash, |