wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Merge ba354cc649 into 6a74590063

Browse source
This commit is contained in:
John Ericson 2025-06-23 10:55:18 +03:00 • committed by GitHub
commit 63f011bc71
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/meson.build
View file

@ -355,13 +355,7 @@ libraries_private = []
extra_pkg_config_variables = { extra_pkg_config_variables = {
'storedir' : get_option('store-dir'), 'storedir' : get_option('store-dir'),
'localstatedir' : get_option('localstatedir'),
} }
# Working around https://github.com/mesonbuild/meson/issues/13584
if host_machine.system() != 'darwin'
extra_pkg_config_variables += {
'localstatedir' : get_option('localstatedir'),
}
endif
subdir('nix-meson-build-support/export') subdir('nix-meson-build-support/export')

7
src/nix/meson.build
View file

@ -5,7 +5,6 @@ project('nix', 'cpp',
# TODO(Qyriad): increase the warning level # TODO(Qyriad): increase the warning level
'warning_level=1', 'warning_level=1',
'errorlogs=true', # Please print logs for tests that fail 'errorlogs=true', # Please print logs for tests that fail
'localstatedir=/nix/var',
], ],
meson_version : '>= 1.4', meson_version : '>= 1.4',
license : 'LGPL-2.1-or-later', license : 'LGPL-2.1-or-later',
@ -249,11 +248,7 @@ custom_target(
# TODO(Ericson3214): Doesn't yet work # TODO(Ericson3214): Doesn't yet work
#meson.override_find_program(linkname, t) #meson.override_find_program(linkname, t)
localstatedir = nix_store.get_variable( localstatedir = nix_store.get_variable('localstatedir')
'localstatedir',
default_value : get_option('localstatedir'),
)
assert(localstatedir == get_option('localstatedir'))
store_dir = nix_store.get_variable('storedir') store_dir = nix_store.get_variable('storedir')
subdir('scripts') subdir('scripts')
subdir('misc') subdir('misc')