diff --git a/meson.build b/meson.build index 023791979..4a3a517fb 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,10 @@ project( 'cpp', version : files('.version'), subproject_dir : 'src', - default_options : [ 'localstatedir=/nix/var' ], + default_options : [ + 'localstatedir=/nix/var', + # hack for trailing newline + ], meson_version : '>= 1.1', ) diff --git a/src/libexpr-test-support/include/nix/expr/tests/meson.build b/src/libexpr-test-support/include/nix/expr/tests/meson.build index e44d25582..84ec401ab 100644 --- a/src/libexpr-test-support/include/nix/expr/tests/meson.build +++ b/src/libexpr-test-support/include/nix/expr/tests/meson.build @@ -2,4 +2,9 @@ include_dirs = [ include_directories('../../..') ] -headers = files('libexpr.hh', 'nix_api_expr.hh', 'value/context.hh') +headers = files( + 'libexpr.hh', + 'nix_api_expr.hh', + 'value/context.hh', + # hack for trailing newline +) diff --git a/src/libstore/linux/include/nix/store/meson.build b/src/libstore/linux/include/nix/store/meson.build index eb2ae2583..c8e6a8268 100644 --- a/src/libstore/linux/include/nix/store/meson.build +++ b/src/libstore/linux/include/nix/store/meson.build @@ -1,3 +1,6 @@ include_dirs += include_directories('../..') -headers += files('personality.hh') +headers += files( + 'personality.hh', + # hack for trailing newline +) diff --git a/src/libstore/linux/meson.build b/src/libstore/linux/meson.build index 93084a8ae..5771cead5 100644 --- a/src/libstore/linux/meson.build +++ b/src/libstore/linux/meson.build @@ -1,3 +1,6 @@ -sources += files('personality.cc') +sources += files( + 'personality.cc', + # hack for trailing newline +) subdir('include/nix/store') diff --git a/src/libutil/freebsd/include/nix/util/meson.build b/src/libutil/freebsd/include/nix/util/meson.build index 283c49b95..4b7d78624 100644 --- a/src/libutil/freebsd/include/nix/util/meson.build +++ b/src/libutil/freebsd/include/nix/util/meson.build @@ -2,4 +2,7 @@ include_dirs += include_directories('../..') -headers += files('freebsd-jail.hh') +headers += files( + 'freebsd-jail.hh', + # hack for trailing newline +) diff --git a/src/libutil/freebsd/meson.build b/src/libutil/freebsd/meson.build index 34508efd0..d9b91a03d 100644 --- a/src/libutil/freebsd/meson.build +++ b/src/libutil/freebsd/meson.build @@ -1,3 +1,6 @@ -sources += files('freebsd-jail.cc') +sources += files( + 'freebsd-jail.cc', + # hack for trailing newline +) subdir('include/nix/util') diff --git a/src/libutil/linux/include/nix/util/meson.build b/src/libutil/linux/include/nix/util/meson.build index ac5f318f8..ec7030c49 100644 --- a/src/libutil/linux/include/nix/util/meson.build +++ b/src/libutil/linux/include/nix/util/meson.build @@ -2,4 +2,8 @@ include_dirs += include_directories('../..') -headers += files('cgroup.hh', 'linux-namespaces.hh') +headers += files( + 'cgroup.hh', + 'linux-namespaces.hh', + # hack for trailing newline +) diff --git a/src/libutil/linux/meson.build b/src/libutil/linux/meson.build index f3fe07c9c..230dd46f3 100644 --- a/src/libutil/linux/meson.build +++ b/src/libutil/linux/meson.build @@ -1,3 +1,7 @@ -sources += files('cgroup.cc', 'linux-namespaces.cc') +sources += files( + 'cgroup.cc', + 'linux-namespaces.cc', + # hack for trailing newline +) subdir('include/nix/util') diff --git a/src/libutil/windows/include/nix/util/meson.build b/src/libutil/windows/include/nix/util/meson.build index f0d4c37e9..5d0ace929 100644 --- a/src/libutil/windows/include/nix/util/meson.build +++ b/src/libutil/windows/include/nix/util/meson.build @@ -2,4 +2,9 @@ include_dirs += include_directories('../..') -headers += files('signals-impl.hh', 'windows-async-pipe.hh', 'windows-error.hh') +headers += files( + 'signals-impl.hh', + 'windows-async-pipe.hh', + 'windows-error.hh', + # hack for trailing newline +) diff --git a/src/perl/t/meson.build b/src/perl/t/meson.build index cd98453c3..5e75920ac 100644 --- a/src/perl/t/meson.build +++ b/src/perl/t/meson.build @@ -5,7 +5,10 @@ # src #--------------------------------------------------- -nix_perl_tests = files('init.t') +nix_perl_tests = files( + 'init.t', + # hack for trailing newline +) foreach f : nix_perl_tests diff --git a/tests/functional/plugins/meson.build b/tests/functional/plugins/meson.build index 7cbc935c9..41050ffc1 100644 --- a/tests/functional/plugins/meson.build +++ b/tests/functional/plugins/meson.build @@ -1,6 +1,9 @@ libplugintest = shared_module( 'plugintest', 'plugintest.cc', - dependencies : [ dependency('nix-expr') ], + dependencies : [ + dependency('nix-expr'), + # hack for trailing newline + ], build_by_default : false, ) diff --git a/tests/functional/test-libstoreconsumer/meson.build b/tests/functional/test-libstoreconsumer/meson.build index d27647ec4..ce566035f 100644 --- a/tests/functional/test-libstoreconsumer/meson.build +++ b/tests/functional/test-libstoreconsumer/meson.build @@ -1,6 +1,9 @@ libstoreconsumer_tester = executable( 'test-libstoreconsumer', 'main.cc', - dependencies : [ dependency('nix-store') ], + dependencies : [ + dependency('nix-store'), + # hack for trailing newline + ], build_by_default : false, )