nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-13 22:12:43 +01:00
Code Activity

Merge pull request #11809 from nix-windows/windows-build/meson-fixes

Browse source 
Meson fixes for msys2 builds
This commit is contained in:
John Ericson 2024-11-05 10:46:03 -05:00 • committed by GitHub
commit dfd0033afb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 47 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/meson.build
View file

@ -34,6 +34,8 @@ subdir('build-utils-meson/subprojects')
run_command('ln', '-s',
meson.project_build_root() / '__nothing_link_target',
meson.project_build_root() / '__nothing_symlink',
# native doesn't allow dangling symlinks, which the tests require
env : { 'MSYS' : 'winsymlinks:lnk' },
check : true,
)
can_link_symlink = run_command('ln',
@ -74,6 +76,11 @@ if host_machine.system() == 'darwin'
deps_other += [sandbox]
endif
if host_machine.system() == 'windows'
wsock32 = cxx.find_library('wsock32')
deps_other += [wsock32]
endif
subdir('build-utils-meson/threads')
boost = dependency(