about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-17T15·27+0100
committerVincent Ambo <tazjin@google.com>2020-05-17T15·28+0100
commit65a1aae98ce5a237c9643e639e550c8b0c0be7f1 (patch)
tree3bc64c9542cc12d5e4d7b22e563aae3771a47f1c
parentc94ef8d00b248339f5dfcdda7b9d102a56f06bc7 (diff)
fix(3p/nix): Fix Meson configuration for libexpr r/739
-rw-r--r--third_party/nix/src/libexpr/meson.build43
1 files changed, 3 insertions, 40 deletions
diff --git a/third_party/nix/src/libexpr/meson.build b/third_party/nix/src/libexpr/meson.build
index a5371a251c7c..b60ec33fa612 100644
--- a/third_party/nix/src/libexpr/meson.build
+++ b/third_party/nix/src/libexpr/meson.build
@@ -1,12 +1,3 @@
-# Nix lib expr build file
-#============================================================================
-
-
-
-
-# src files
-#============================================================================
-
 src_inc += include_directories('.', 'primops')
 
 libexpr_src = files(
@@ -19,13 +10,15 @@ libexpr_src = files(
     join_paths(meson.source_root(), 'src/libexpr/attr-set.cc'),
     join_paths(meson.source_root(), 'src/libexpr/common-eval-args.cc'),
     join_paths(meson.source_root(), 'src/libexpr/eval.cc'),
+    join_paths(meson.source_root(), 'src/libexpr/function-trace.cc'),
     join_paths(meson.source_root(), 'src/libexpr/get-drvs.cc'),
     join_paths(meson.source_root(), 'src/libexpr/json-to-value.cc'),
     join_paths(meson.source_root(), 'src/libexpr/names.cc'),
     join_paths(meson.source_root(), 'src/libexpr/nixexpr.cc'),
     join_paths(meson.source_root(), 'src/libexpr/primops.cc'),
     join_paths(meson.source_root(), 'src/libexpr/value-to-json.cc'),
-    join_paths(meson.source_root(), 'src/libexpr/value-to-xml.cc'))
+    join_paths(meson.source_root(), 'src/libexpr/value-to-xml.cc'),
+)
 
 libexpr_headers = files(
     join_paths(meson.source_root(), 'src/libexpr/attr-path.hh'),
@@ -44,12 +37,6 @@ libexpr_headers = files(
     join_paths(meson.source_root(), 'src/libexpr/value-to-json.hh'),
     join_paths(meson.source_root(), 'src/libexpr/value-to-xml.hh'))
 
-
-
-
-# dependancies
-#============================================================================
-
 libexpr_dep_list = [
     libdl_dep,
     libsodium_dep]
@@ -58,12 +45,6 @@ if sys_name == 'freebsd'
     libexpr_dep_list += libdl_dep
 endif
 
-
-
-
-# Link args
-#============================================================================
-
 libexpr_link_list = [
     libutil_lib,
     libstore_lib,
@@ -71,20 +52,8 @@ libexpr_link_list = [
 
 libexpr_link_args = []
 
-
-
-
-# compiler args
-#============================================================================
-
 libexpr_cxx_args = []
 
-
-
-
-# targets
-#============================================================================
-
 libexpr_src += custom_target(
     'parser_tab.[cchh]',
     output : [
@@ -108,12 +77,6 @@ libexpr_src += custom_target(
         '--header-file=@OUTPUT1@',
         '@INPUT@'])
 
-
-
-
-# build
-#============================================================================
-
 libexpr_lib = library(
     'nixexpr',
     install : true,