feat(3p/nix): Add glog dependency

third_party/default.nix

@@ -54,6 +54,7 @@ let
       freetype
       gettext
       glibc
+      glog
       gnutar
       go
       google-cloud-sdk

third_party/nix/default.nix

@@ -36,6 +36,7 @@ in stdenv.mkDerivation {
     curl
     editline
     flex
+    glog
     largeBoehm
     libseccomp
     libsodium

third_party/nix/meson.build

@@ -419,6 +419,11 @@ libbz2_dep = declare_dependency(
     dependencies : cpp.find_library('bz2'),
     link_args : get_option('bz2_link_args'))
 
+# Look for glog, a required dependency.
+#--------------------------------------
+glog_dep = declare_dependency(
+  dependencies : cpp.find_library('glog'),
+  link_args : get_option('glog_link_args'))
 
 # Look for editline, a required dependency.
 #--------------------------------------------------
@@ -441,8 +446,6 @@ if not (
 endif
 
 
-
-
 # Optional dependancies
 #============================================================================
 
@@ -485,8 +488,6 @@ if (get_option('with_s3'))
 endif
 
 
-
-
 # OS Specific checks
 #============================================================================
 # Look for libsecppomp, required for Linux sandboxing.
@@ -512,8 +513,6 @@ if (sys_name.contains('sunos'))
 endif
 
 
-
-
 # build
 #============================================================================
 

third_party/nix/meson_options.txt

@@ -140,6 +140,13 @@ option(
         '-lgc'],
     description : 'link args for boehm garbage collector')
 
+option(
+    'glog_link_args',
+    type : 'array',
+    value : [
+        '-L/usr/local/lib',
+        '-lglog'],
+    description : 'link args for glog')
 
 
 # optional dependancies

third_party/nix/src/nix/main.cc

@@ -10,6 +10,7 @@
 #include "eval.hh"
 #include "finally.hh"
 #include "globals.hh"
+#include "glog/logging.h"
 #include "legacy.hh"
 #include "progress-bar.hh"
 #include "shared.hh"
@@ -166,7 +167,10 @@ void mainWrapped(int argc, char** argv) {
 
 }  // namespace nix
 
-int main(int argc, char** argv) {
+int main(int argc, char* argv[]) {
+  FLAGS_logtostderr = 1;
+  google::InitGoogleLogging(argv[0]);
+
   return nix::handleExceptions(argv[0],
                                [&]() { nix::mainWrapped(argc, argv); });
 }

third_party/nix/src/nix/meson.build

@@ -53,18 +53,20 @@ nix_headers = files (
   join_paths(meson.source_root(), 'src/nix-store/graphml.hh'))
 
 nix_dep_list = [
-    gc_dep,
-    pthread_dep,
-    libdl_dep,
   boost_dep,
   editline_dep,
-    libsodium_dep]
+  gc_dep,
+  glog_dep,
+  libdl_dep,
+  libsodium_dep,
+  pthread_dep,
+]
 
 nix_link_list = [
   libutil_lib,
   libstore_lib,
   libmain_lib,
-    libexpr_lib
+  libexpr_lib,
 ]
 
 nix_bin = executable(