nix-eval-jobs: make available as a submodule for nice development usage
This is to make it much nicer to develop. We could also do this for perl. Change-Id: Id4cefff0c2a3658a0dacd987a9dd9ddda50765fe
This commit is contained in:
committed by
Jade Lovelace
parent
f5fbf9bce0
commit
64e33a7e09
@@ -122,6 +122,7 @@ if not get_option('enable-build')
|
||||
subdir_done()
|
||||
endif
|
||||
|
||||
enable_nix_eval_jobs = get_option('nix-eval-jobs')
|
||||
enable_tests = get_option('enable-tests')
|
||||
|
||||
tests_args = []
|
||||
@@ -609,3 +610,11 @@ if enable_tests
|
||||
endif
|
||||
|
||||
subdir('meson/clang-tidy')
|
||||
|
||||
if enable_nix_eval_jobs.enabled()
|
||||
subproject(
|
||||
'nix-eval-jobs',
|
||||
# Well, it was enabled! Surely it's wanted.
|
||||
required : true,
|
||||
)
|
||||
endif
|
||||
|
||||
@@ -60,6 +60,10 @@ option('internal-api-docs', type : 'feature', value : 'auto',
|
||||
description : 'whether to build internal API documentation (requires doxygen)',
|
||||
)
|
||||
|
||||
option('nix-eval-jobs', type : 'feature', value : 'disabled',
|
||||
description : 'whether to build nix-eval-jobs as part of the Lix build. For development purposes only: do not do packaging with this.',
|
||||
)
|
||||
|
||||
# A relative path means it gets appended to prefix.
|
||||
option('profile-dir', type : 'string', value : 'etc/profile.d',
|
||||
description : 'the path to install shell profile files',
|
||||
|
||||
@@ -12,9 +12,9 @@ nix_main_dep = dependency('lix-main', required: true)
|
||||
nix_store_dep = dependency('lix-store', required: true)
|
||||
nix_expr_dep = dependency('lix-expr', required: true)
|
||||
nix_cmd_dep = dependency('lix-cmd', required: true)
|
||||
nix_util_dep = dependency('lix-util', required: true)
|
||||
threads_dep = dependency('threads', required: true)
|
||||
nlohmann_json_dep = dependency('nlohmann_json', required: true)
|
||||
boost_dep = dependency('boost', required: true)
|
||||
kj_async_dep = dependency('kj-async', required: true)
|
||||
|
||||
subdir('src')
|
||||
|
||||
@@ -22,13 +22,14 @@ configure_file(
|
||||
|
||||
executable('nix-eval-jobs', src,
|
||||
dependencies : [
|
||||
nix_util_dep,
|
||||
nix_main_dep,
|
||||
nix_store_dep,
|
||||
nix_expr_dep,
|
||||
nix_cmd_dep,
|
||||
boost_dep,
|
||||
nlohmann_json_dep,
|
||||
threads_dep
|
||||
threads_dep,
|
||||
],
|
||||
install: true,
|
||||
cpp_args: ['--include', 'autotools-config.h'])
|
||||
|
||||
Reference in New Issue
Block a user