From fed31b2c9b364fc1ed0b724c21b068cdedf46ee7 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Wed, 20 May 2020 04:02:23 +0100
Subject: feat(3p/nix): Add some initial Abseil build targets

These make it possible to link to Abseil strings.
---
 third_party/nix/meson.build             |  4 ++++
 third_party/nix/meson_options.txt       |  2 --
 third_party/nix/src/libutil/meson.build | 17 +++++++++--------
 3 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'third_party')

diff --git a/third_party/nix/meson.build b/third_party/nix/meson.build
index abf5b7b427ec..9020f4f87e60 100644
--- a/third_party/nix/meson.build
+++ b/third_party/nix/meson.build
@@ -348,6 +348,10 @@ description : 'Whether link() works on symlinks')
 # This will need to change if //third_party/nix is every split out as
 # a subtree.
 absl = cmake.subproject('abseil_cpp')
+absl_base = absl.dependency('base')
+absl_raw_logging = absl.dependency('raw_logging_internal')
+absl_int128 = absl.dependency('int128')
+absl_strings = absl.dependency('strings')
 
 # Look for boost, a required dependency.
 #--------------------------------------------------
diff --git a/third_party/nix/meson_options.txt b/third_party/nix/meson_options.txt
index 663e5c42abc6..1b1efffe48d7 100644
--- a/third_party/nix/meson_options.txt
+++ b/third_party/nix/meson_options.txt
@@ -11,8 +11,6 @@ option(
     description : 'path of the Nix store (defaults to /nix/store)')
 
 
-
-
 # compiler args
 #============================================================================
 
diff --git a/third_party/nix/src/libutil/meson.build b/third_party/nix/src/libutil/meson.build
index 325a7d33baa7..a6494e6eac7c 100644
--- a/third_party/nix/src/libutil/meson.build
+++ b/third_party/nix/src/libutil/meson.build
@@ -39,14 +39,15 @@ libutil_headers = files(
 )
 
 libutil_dep_list = [
-    glog_dep,
-    boost_dep,
-    libbz2_dep,
-    liblzma_dep,
-    libbrotli_dep,
-    openssl_dep,
-    pthread_dep,
-    libsodium_dep]
+  glog_dep,
+  boost_dep,
+  libbz2_dep,
+  liblzma_dep,
+  libbrotli_dep,
+  openssl_dep,
+  pthread_dep,
+  libsodium_dep,
+]
 
 libutil_link_list = []
 libutil_link_args = []
-- 
cgit 1.4.1