From 6bc7e7de2042150d3e933989655751afd66b7cd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 29 Jul 2025 18:51:45 +0200 Subject: [PATCH] buildMozillaMach: restore macos sdk relax for 142 and later 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. --- .../build-mozilla-mach/142-relax-apple-sdk.patch | 13 +++++++++++++ pkgs/build-support/build-mozilla-mach/default.nix | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch diff --git a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch new file mode 100644 index 000000000000..c6e28f11be2f --- /dev/null +++ b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch @@ -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", diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 3c8dd8d416f3..84f140ef0998 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -319,6 +319,9 @@ buildStdenv.mkDerivation { ++ lib.optionals (lib.versionAtLeast version "139" && lib.versionOlder version "142") [ ./139-relax-apple-sdk.patch ] + ++ lib.optionals (lib.versionAtLeast version "142") [ + ./142-relax-apple-sdk.patch + ] ++ lib.optionals (lib.versionOlder version "139") [ # Fix for missing vector header on macOS # https://bugzilla.mozilla.org/show_bug.cgi?id=1959377