Unverified Commit 6bc7e7de authored by Martin Weinelt's avatar Martin Weinelt
Browse files

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.
parent 0026f502

pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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",

pkgs/build-support/build-mozilla-mach/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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