Merge pull request #13775 from xokdvium/more-pch

treewide: Futher improve compile times for clangStdenv builds

src/libexpr-tests/meson.build

@@ -75,6 +75,7 @@ this_exe = executable(
   # TODO: -lrapidcheck, see ../libutil-support/build.meson
   link_args : linker_export_flags + [ '-lrapidcheck' ],
   install : true,
+  cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
 
 test(

src/libexpr-tests/pch/precompiled-headers.hh

@@ -0,0 +1,4 @@
+#include "nix/expr/tests/libexpr.hh"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>

src/libfetchers/git-lfs-fetch.cc

@@ -292,7 +292,7 @@ void Fetch::fetch(
             auto authIt = headerIt->find("Authorization");
             if (authIt == headerIt->end())
                 return std::nullopt;
-            return *authIt;
+            return std::string(*authIt);
         }();
         const uint64_t size = obj.at("size");
         sizeCallback(size);

src/libfetchers/meson.build

@@ -66,6 +66,7 @@ this_library = library(
   link_args : linker_export_flags,
   prelink : true, # For C++ static initializers
   install : true,
+  cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
 
 install_headers(headers, subdir : 'nix/fetchers', preserve_path : true)

src/libfetchers/pch/precompiled-headers.hh

@@ -0,0 +1,3 @@
+#include "nix/fetchers/fetchers.hh"
+#include "nix/store/store-api.hh"
+#include "nix/util/json-utils.hh"

src/libstore-tests/meson.build

@@ -94,6 +94,7 @@ this_exe = executable(
   link_args : linker_export_flags + [ '-lrapidcheck' ],
   # get main from gtest
   install : true,
+  cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
 
 test(
@@ -127,6 +128,7 @@ if get_option('benchmarks')
     include_directories : include_dirs,
     link_args : linker_export_flags,
     install : true,
+    cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
     cpp_args : [
       '-DNIX_UNIT_TEST_DATA="' + meson.current_source_dir() + '/data"',
     ],

src/libstore-tests/pch/precompiled-headers.hh

@@ -0,0 +1,9 @@
+#include "nix/store/store-api.hh"
+#include "nix/store/tests/libstore.hh"
+#include "nix/util/util.hh"
+
+#include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
+#include <rapidcheck/gtest.h>
+
+#include <regex>

src/libutil-tests/meson.build

@@ -89,6 +89,7 @@ this_exe = executable(
   link_args : linker_export_flags + [ '-lrapidcheck' ],
   # get main from gtest
   install : true,
+  cpp_pch : do_pch ? [ 'pch/precompiled-headers.hh' ] : [],
 )
 
 test(

src/libutil-tests/pch/precompiled-headers.hh

@@ -0,0 +1,5 @@
+#include "nix/util/util.hh"
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <rapidcheck/gtest.h>

src/nix/pch/precompiled-headers.hh

@@ -1,3 +1,6 @@
 #include "nix/cmd/command.hh"
 #include "nix/expr/eval.hh"
 #include "nix/main/shared.hh"
+#include "nix/store/derivations.hh"
+
+#include <nlohmann/json.hpp>