maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(3p/nix): Compatibility with updated SymbolTable

Browse source 
The functions in SymbolTable have been renamed to match the Google
Style guide, and some debug-only functions have been removed.
This commit is contained in:
Vincent Ambo 2020-05-21 04:56:22 +01:00
parent 97e85f94e5
commit c395a48be2
21 changed files with 141 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

14
third_party/nix/src/libexpr/meson.build vendored
View file

@ -16,6 +16,7 @@ libexpr_src = files(
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/symbol-table.cc'),
join_paths(meson.source_root(), 'src/libexpr/value-to-json.cc'),
join_paths(meson.source_root(), 'src/libexpr/value-to-xml.cc'),
)
@ -42,18 +43,17 @@ libexpr_dep_list = [
glog_dep,
libdl_dep,
libsodium_dep,
]
if sys_name == 'freebsd'
libexpr_dep_list += libdl_dep
endif
] + absl_deps
libexpr_link_list = [
libutil_lib,
libstore_lib,
libmain_lib]
libmain_lib,
]
libexpr_link_args = []
libexpr_link_args = [
'-lpthread',
]
libexpr_cxx_args = []