From 4de63f784c53f5400cc454f6faadc907b34f4ac2 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 21 Jun 2020 21:41:46 +0100 Subject: fix(3p/nix): propagate dependencies which are needed by people linking in nix This includes absl, which we install into the output, and boost and the boehm GC, which are moved to propagated deps. Change-Id: I8f9f9795ff92e26b2320359064241d7fd59c2d33 Reviewed-on: https://cl.tvl.fyi/c/depot/+/549 Reviewed-by: tazjin --- third_party/nix/CMakeLists.txt | 8 ++++++++ third_party/nix/default.nix | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'third_party/nix') 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 = '' -- cgit 1.4.1