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

Merge pull request #14435 from NixOS/backport-14432-to-2.32-maintenance

Browse source 
[Backport 2.32-maintenance] meson: Also split version string at '+' for Darwin
This commit is contained in:
internal-nix-ci[bot] 2025-10-31 22:24:18 +00:00 • committed by GitHub
commit fc6811cb51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nix-meson-build-support/common/meson.build
View file

@ -42,7 +42,7 @@ if cxx.get_id() == 'clang'
add_project_arguments('-fpch-instantiate-templates', language : 'cpp') add_project_arguments('-fpch-instantiate-templates', language : 'cpp')
endif endif
# Darwin ld doesn't like "X.Y.Zpre" # Darwin ld doesn't like "X.Y.ZpreABCD+W"
nix_soversion = meson.project_version().split('pre')[0] nix_soversion = meson.project_version().split('+')[0].split('pre')[0]
subdir('assert-fail') subdir('assert-fail')