mirror of
https://github.com/NixOS/nix.git
synced 2025-11-08 19:46:02 +01:00
Merge pull request #13900 from NixOS/fix-mingw-windows-build
Fix downstream MinGW build by not looking for Boost Regex
This commit is contained in:
commit
49e9c14e2f
3 changed files with 15 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue