From 7a4158692e54b53ec98fc4c5a054bcc263d250e3 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 7 Dec 2025 12:56:08 -0500 Subject: [PATCH] buildMozillaMach: revert apple SDK bump to 26.1 Our SDK version is still 26.0. Upstream bumped it proactively because of artifact availability concerns, not because a patch needed it. https://bugzilla.mozilla.org/show_bug.cgi?id=1998070#c0 Fixes #468479 --- pkgs/build-support/build-mozilla-mach/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index c064d5d4266f..165c6dff66e0 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -45,6 +45,7 @@ in pkgs, stdenv, patchelf, + fetchpatch, # build time autoconf, @@ -328,6 +329,16 @@ buildStdenv.mkDerivation { # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9 ./139-wayland-drag-animation.patch ] + # Revert apple sdk bump to 26.1 + ++ + lib.optionals (lib.versionAtLeast version "146" && lib.versionOlder apple-sdk_26.version "26.1") + [ + (fetchpatch { + url = "https://github.com/mozilla-firefox/firefox/commit/c1cd0d56e047a40afb2a59a56e1fd8043e448e05.patch"; + hash = "sha256-bFHLy3b0jOcROqltIwHwSAqWYve8OZHbiPMOdhLUCLc="; + revert = true; + }) + ] ++ extraPatches; postPatch = ''