nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11063 from obsidiansystems/config-expr

Browse Source 
Forgot to include `config-expr.hh` in two places
This commit is contained in:
John Ericson 2024-07-08 11:27:57 -04:00 committed by GitHub
commit 1439de874f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libcmd/meson.build
View File

@ -64,6 +64,7 @@ add_project_arguments(
'-include', 'config-util.hh', '-include', 'config-util.hh',
'-include', 'config-store.hh', '-include', 'config-store.hh',
# '-include', 'config-fetchers.h', # '-include', 'config-fetchers.h',
'-include', 'config-expr.hh',
'-include', 'config-main.hh', '-include', 'config-main.hh',
'-include', 'config-cmd.hh', '-include', 'config-cmd.hh',
language : 'cpp', language : 'cpp',

1
src/libexpr/meson.build
View File

@ -69,6 +69,7 @@ add_project_arguments(
'-include', 'config-util.hh', '-include', 'config-util.hh',
'-include', 'config-store.hh', '-include', 'config-store.hh',
# '-include', 'config-fetchers.h', # '-include', 'config-fetchers.h',
'-include', 'config-expr.hh',
language : 'cpp', language : 'cpp',
) )

2
tests/unit/libexpr/meson.build
View File

@ -41,7 +41,7 @@ add_project_arguments(
# It would be nice for our headers to be idempotent instead. # It would be nice for our headers to be idempotent instead.
'-include', 'config-util.hh', '-include', 'config-util.hh',
'-include', 'config-store.hh', '-include', 'config-store.hh',
'-include', 'config-store.hh', '-include', 'config-expr.hh',
'-include', 'config-util.h', '-include', 'config-util.h',
'-include', 'config-store.h', '-include', 'config-store.h',
'-include', 'config-expr.h', '-include', 'config-expr.h',

2
tests/unit/libfetchers/meson.build
View File

@ -37,7 +37,7 @@ add_project_arguments(
# It would be nice for our headers to be idempotent instead. # It would be nice for our headers to be idempotent instead.
'-include', 'config-util.hh', '-include', 'config-util.hh',
'-include', 'config-store.hh', '-include', 'config-store.hh',
'-include', 'config-store.hh', # '-include', 'config-fetchers.h',
language : 'cpp', language : 'cpp',
) )