aboutsummaryrefslogtreecommitdiff
path: root/src/nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2020-06-03 20:35:14 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2020-06-03 20:45:14 -0400
commit53bc8ff152091173e11f2bead245541e3037d769 (patch)
tree38a182c213e1a2d53a42b18a8abaf9c5f9224741 /src/nix
parent3c78ac348c3a32fa6d78d3c56645901513c2e731 (diff)
No C++ designated initializers yet with Clang 7
Diffstat (limited to 'src/nix')
-rw-r--r--src/nix/add-to-store.cc4
-rw-r--r--src/nix/make-content-addressable.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index b92597cc2..3162e0c62 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -49,8 +49,8 @@ struct CmdAddToStore : MixDryRun, StoreCommand
info.narHash = narHash;
info.narSize = sink.s->size();
*info.ca = FileSystemHash {
- .method = FileIngestionMethod::Recursive,
- .hash = info.narHash
+ FileIngestionMethod::Recursive,
+ info.narHash,
};
if (!dryRun) {
diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc
index 5003ff459..d19e681bd 100644
--- a/src/nix/make-content-addressable.cc
+++ b/src/nix/make-content-addressable.cc
@@ -83,8 +83,8 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
info.narHash = narHash;
info.narSize = sink.s->size();
info.ca = FileSystemHash {
- .method = FileIngestionMethod::Recursive,
- .hash = info.narHash,
+ FileIngestionMethod::Recursive,
+ info.narHash,
};
if (!json)