No C++ designated initializers yet with Clang 7

src/libfetchers/tarball.cc

@@ -71,8 +71,8 @@ DownloadFileResult downloadFile(
         info.narHash = hashString(HashType::SHA256, *sink.s);
         info.narSize = sink.s->size();
         info.ca = FileSystemHash {
-            .method = FileIngestionMethod::Flat,
-            .hash = hash,
+            FileIngestionMethod::Flat,
+            hash,
         };
         auto source = StringSource { *sink.s };
         store->addToStore(info, source, NoRepair, NoCheckSigs);

src/libstore/build.cc

@@ -3757,10 +3757,7 @@ void DerivationGoal::registerOutputs()
             else
                 assert(worker.store.parseStorePath(path) == dest);
 
-            ca = FileSystemHash {
-                .method = i.second.hash->method,
-                .hash = h2,
-            };
+            ca = FileSystemHash { i.second.hash->method, h2 };
         }
 
         /* Get rid of all weird permissions.  This also checks that

src/libstore/local-store.cc

@@ -1093,10 +1093,7 @@ StorePath LocalStore::addToStoreFromDump(const string & dump, const string & nam
             ValidPathInfo info(dstPath.clone());
             info.narHash = hash.first;
             info.narSize = hash.second;
-            info.ca = FileSystemHash {
-                .method = method,
-                .hash = h,
-            };
+            info.ca = FileSystemHash { method, h };
             registerValidPath(info);
         }
 

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) {

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)