From e494a347b52c96543eec91bc73756a22fe336292 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 29 May 2020 21:51:29 +0100
Subject: fix(3p/nix): Build glog as included CMake project

---
 third_party/nix/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'third_party/nix/default.nix')

diff --git a/third_party/nix/default.nix b/third_party/nix/default.nix
index aa2fd3b7afef..c31de41eddc7 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
-- 
cgit 1.4.1