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

Merge pull request #12773 from roberth/config-h-low-hanging-fruit

Browse source 
Unexpose config headers (low hanging fruit only)
This commit is contained in:
John Ericson 2025-03-28 12:43:28 -04:00 • committed by GitHub
commit c36a9b8e1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 25 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libflake-c/meson.build
View file

@ -14,8 +14,6 @@ cxx = meson.get_compiler('cpp')
subdir('nix-meson-build-support/deps-lists')
configdata = configuration_data()
deps_private_maybe_subproject = [
dependency('nix-util'),
dependency('nix-store'),
@ -29,14 +27,6 @@ deps_public_maybe_subproject = [
]
subdir('nix-meson-build-support/subprojects')
# TODO rename, because it will conflict with downstream projects
configdata.set_quoted('PACKAGE_VERSION', meson.project_version())
config_h = configure_file(
configuration : configdata,
output : 'config-flake.h',
)
add_project_arguments(
# TODO(Qyriad): Yes this is how the autoconf+Make system did it.
# It would be nice for our headers to be idempotent instead.
@ -48,11 +38,6 @@ add_project_arguments(
# not generated (yet?)
# '-include', 'config-flake.hh',
# From C libraries, for our public, installed headers too
'-include', 'config-util.h',
'-include', 'config-store.h',
'-include', 'config-expr.h',
'-include', 'config-flake.h',
language : 'cpp',
)
@ -64,7 +49,7 @@ sources = files(
include_dirs = [include_directories('.')]
headers = [config_h] + files(
headers = files(
'nix_api_flake.h',
)