wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

More fixes

Browse source
This commit is contained in:
John Ericson 2024-06-27 19:19:32 -04:00
parent 5ba9f6cec6
commit 479befa76d
30 changed files with 101 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libexpr/meson.build
View file

@ -55,6 +55,9 @@ if bdw_gc.found()
endif
configdata.set('HAVE_BOEHMGC', bdw_gc.found().to_int())
toml11 = dependency('toml11', version : '>=3.7.0', method : 'cmake')
deps_other += toml11
config_h = configure_file(
configuration : configdata,
output : 'config-expr.hh',
@ -117,8 +120,7 @@ generated_headers = []
foreach header : [
'imported-drv-to-derivation.nix',
'fetchurl.nix',
'flake/call-flake.nix',
'primops/derivation.nix',
'call-flake.nix',
]
generated_headers += custom_target(
command : [ 'bash', '-c', '{ echo \'R"__NIX_STR(\' && cat @INPUT@ && echo \')__NIX_STR"\'; } > "$1"', '_ignored_argv0', '@OUTPUT@' ],
@ -142,11 +144,6 @@ sources = files(
'nixexpr.cc',
'paths.cc',
'primops.cc',
'primops/context.cc',
'primops/fetchClosure.cc',
'primops/fetchMercurial.cc',
'primops/fetchTree.cc',
'primops/fromTOML.cc',
'print-ambiguous.cc',
'print.cc',
'search-path.cc',
@ -187,6 +184,8 @@ headers = [config_h] + files(
'value/context.hh',
)
subdir('primops')
this_library = library(
'nixexpr',
sources,