nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 07:22:43 +01:00
Code Activity

Hack together a fix for the public headers

Browse source 
Please fix this.
This commit is contained in:
Robert Hensing 2025-04-05 00:46:06 +02:00
parent 59ced3da96
commit 2b51250534
8 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/meson.build
View file

@ -158,6 +158,7 @@ if get_option('embedded-sandbox-shell')
# The path to busybox is passed as a -D flag when compiling this_library.
# This solution is inherited from the old make buildsystem
# TODO: do this differently?
# TODO: at least define it unconditionally, so we get checking from -Wundef
configdata_priv.set('HAVE_EMBEDDED_SANDBOX_SHELL', 1)
hexdump = find_program('hexdump', native : true)
embedded_sandbox_shell_gen = custom_target(
@ -181,6 +182,11 @@ config_priv_h = configure_file(
output : 'store-config-private.hh',
)
config_pub_h = configure_file(
configuration : configdata_pub,
output : 'store-config.hh',
)
subdir('nix-meson-build-support/common')
sources = files(
@ -363,7 +369,7 @@ this_library = library(
install : true,
)
install_headers(headers, subdir : 'nix/store', preserve_path : true)
install_headers(headers + [ config_pub_h ], subdir : 'nix/store', preserve_path : true)
libraries_private = []