From 6bdb5e8e099057822a767cae1f8c2c93152dae3c Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 2 Sep 2025 10:40:06 -0400 Subject: [PATCH] Fix downstream MinGW build by not looking for Boost Regex --- src/libexpr/meson.build | 5 ++++- src/libstore/meson.build | 6 +++++- src/libutil/meson.build | 7 ++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/libexpr/meson.build b/src/libexpr/meson.build index 0331d3c61..00fb82e3c 100644 --- a/src/libexpr/meson.build +++ b/src/libexpr/meson.build @@ -40,7 +40,10 @@ endforeach boost = dependency( 'boost', - modules : [ 'container', 'context' ], + modules : [ + 'container', + 'context', + ], include_type : 'system', ) # boost is a public dependency, but not a pkg-config dependency unfortunately, so we diff --git a/src/libstore/meson.build b/src/libstore/meson.build index 2b0106ff3..253152772 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -101,7 +101,11 @@ subdir('nix-meson-build-support/libatomic') boost = dependency( 'boost', - modules : [ 'container', 'regex' ], + modules : [ + 'container', + # Shouldn't list, because can header-only, and Meson currently looks for libs + #'regex', + ], include_type : 'system', ) # boost is a public dependency, but not a pkg-config dependency unfortunately, so we diff --git a/src/libutil/meson.build b/src/libutil/meson.build index c294f895a..cdffc892a 100644 --- a/src/libutil/meson.build +++ b/src/libutil/meson.build @@ -57,7 +57,12 @@ deps_private += blake3 boost = dependency( 'boost', - modules : [ 'context', 'coroutine', 'iostreams', 'url' ], + modules : [ + 'context', + 'coroutine', + 'iostreams', + 'url', + ], include_type : 'system', version : '>=1.82.0', )