diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-29T20·51+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-29T21·04+0100 |
| commit | e494a347b52c96543eec91bc73756a22fe336292 (patch) | |
| tree | 339e96bae727d5d30a8a651a8ffac4975f6ddb88 /third_party/nix/default.nix | |
| parent | 6302a89c6daf1e3303fc53206fd15a2e581eb916 (diff) | |
fix(3p/nix): Build glog as included CMake project r/870
Diffstat (limited to 'third_party/nix/default.nix')
| -rw-r--r-- | third_party/nix/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix index aa2fd3b7af..c31de41edd 100644 --- a/third_party/nix/default.nix +++ b/third_party/nix/default.nix @@ -19,7 +19,8 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { # Abseil's sources need to be symlinked into Nix' sources. postUnpack = '' - ln -fs ${pkgs.abseil_cpp.src} nix/abseil_cpp + ln -fs ${pkgs.abseil_cpp.drvAttrs.src} nix/abseil_cpp + ln -fs ${pkgs.glog.drvAttrs.src} nix/glog ''; nativeBuildInputs = with pkgs; [ @@ -34,8 +35,6 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { # TODO(tazjin): Some of these might only be required for native inputs buildInputs = with pkgs; [ - # TODO(tazjin): Figure out why meson can't make the Abseil headers visible - abseil_cpp aws-s3-cpp boost brotli @@ -43,7 +42,6 @@ in pkgs.llvmPackages.libcxxStdenv.mkDerivation { curl editline flex - glog largeBoehm libseccomp libsodium |