talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

buildMozillaMach: restore macos sdk relax for 142 and later

Browse Source 
This was dropped for the beta/devedition update when it didn't apply,
which broke the darwin build, because it went back to requiring a newer
sdk version than we currently ship.
This commit is contained in:
Martin Weinelt 2025-07-29 18:51:45 +02:00
parent 0026f50279
commit 6bc7e7de20
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index 37c00230c853..dd89bea24392 100644
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
)
def mac_sdk_min_version():
- return "15.5"
+ return "15.2"
@depends(
"--with-macos-sdk",

3
pkgs/build-support/build-mozilla-mach/default.nix
View File

@ -319,6 +319,9 @@ buildStdenv.mkDerivation {
++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [ ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [
./139-relax-apple-sdk.patch ./139-relax-apple-sdk.patch
] ]
++ lib.optionals (lib.versionAtLeast version "142") [
./142-relax-apple-sdk.patch
]
++ lib.optionals (lib.versionOlder version "139") [ ++ lib.optionals (lib.versionOlder version "139") [
# Fix for missing vector header on macOS # Fix for missing vector header on macOS
# https://bugzilla.mozilla.org/show_bug.cgi?id=1959377 # https://bugzilla.mozilla.org/show_bug.cgi?id=1959377