mirror of
https://github.com/NixOS/nix
synced 2025-06-27 12:41:15 +02:00
Rename file to avoid reserved name
This commit is contained in:
parent
79e0ef88bf
commit
6a0582d9fd
59 changed files with 95 additions and 95 deletions
1
src/libflake/build-utils-meson
Symbolic link
1
src/libflake/build-utils-meson
Symbolic link
|
@ -0,0 +1 @@
|
|||
../../build-utils-meson
|
|
@ -1 +0,0 @@
|
|||
../../meson-utils
|
|
@ -14,7 +14,7 @@ project('nix-flake', 'cpp',
|
|||
|
||||
cxx = meson.get_compiler('cpp')
|
||||
|
||||
subdir('meson-utils/deps-lists')
|
||||
subdir('build-utils-meson/deps-lists')
|
||||
|
||||
deps_private_maybe_subproject = [
|
||||
]
|
||||
|
@ -24,7 +24,7 @@ deps_public_maybe_subproject = [
|
|||
dependency('nix-fetchers'),
|
||||
dependency('nix-expr'),
|
||||
]
|
||||
subdir('meson-utils/subprojects')
|
||||
subdir('build-utils-meson/subprojects')
|
||||
|
||||
nlohmann_json = dependency('nlohmann_json', version : '>= 3.9')
|
||||
deps_public += nlohmann_json
|
||||
|
@ -42,7 +42,7 @@ add_project_arguments(
|
|||
language : 'cpp',
|
||||
)
|
||||
|
||||
subdir('meson-utils/diagnostics')
|
||||
subdir('build-utils-meson/diagnostics')
|
||||
|
||||
sources = files(
|
||||
'flake-settings.cc',
|
||||
|
@ -74,4 +74,4 @@ install_headers(headers, subdir : 'nix', preserve_path : true)
|
|||
|
||||
libraries_private = []
|
||||
|
||||
subdir('meson-utils/export')
|
||||
subdir('build-utils-meson/export')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue