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

Fix downstream MinGW build by not looking for Boost Regex

Browse source
This commit is contained in:
John Ericson 2025-09-02 10:40:06 -04:00
parent b806440808
commit 6bdb5e8e09
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libexpr/meson.build
View file

@ -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

6
src/libstore/meson.build
View file

@ -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

7
src/libutil/meson.build
View file

@ -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',
)