diff options
| -rw-r--r-- | third_party/default.nix | 1 | ||||
| -rw-r--r-- | third_party/nix/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | third_party/nix/default.nix | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index adbdf0cd6092..b4b799e8ee59 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -92,6 +92,7 @@ let mdbook meson mime-types + mkShell moreutils nano nginx diff --git a/third_party/nix/CMakeLists.txt b/third_party/nix/CMakeLists.txt index 54bf36233210..fad650a7cade 100644 --- a/third_party/nix/CMakeLists.txt +++ b/third_party/nix/CMakeLists.txt @@ -30,6 +30,14 @@ find_package(LibLZMA) # builds this symlink is automatically replaced with an appropriate # link to the Abseil sources in the Nix store. add_subdirectory(abseil_cpp) +install(DIRECTORY abseil_cpp/absl + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING + PATTERN "*.inc" + PATTERN "*.h" + PATTERN "copts" EXCLUDE + PATTERN "testdata" EXCLUDE + ) # Linking precompiled glog binaries (linked against libstdc++) leads # to working binaries that do not output log messages. It seems that diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index c31de41eddc7..e6fa3f1f7d62 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -36,13 +36,11 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { # TODO(tazjin): Some of these might only be required for native inputs buildInputs = with pkgs; [ aws-s3-cpp - boost brotli bzip2 curl editline flex - largeBoehm libseccomp libsodium openssl @@ -50,6 +48,11 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { xz ]; + propagatedBuildInputs = with pkgs; [ + boost + largeBoehm + ]; + # Install the various symlinks to the Nix binary which users expect # to exist. postInstall = '' |