Unverified Commit a8fe4053 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

buildMozillaMach: reenable system-icu 

By appling a patch from chaotic-nyx linking against icu76 and newer works
again.

From Firefox 139 upstream uses icu77, but it already works today on
138.0.1.

https://bugzilla.mozilla.org/show_bug.cgi?id=1927380
parent d20fb12c

pkgs/applications/networking/browsers/firefox/common.nix

+7 −3
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ in 
  gnum4,

  gtk3,

  icu73,

  icu77,

  libGL,

  libGLU,

  libevent,
@@ -327,6 +328,10 @@ buildStdenv.mkDerivation { 
      rm -rf obj-x86_64-pc-linux-gnu

      patchShebangs mach build

    ''

    # https://bugzilla.mozilla.org/show_bug.cgi?id=1927380

    + lib.optionalString (lib.versionAtLeast version "134") ''

      sed -i "s/icu-i18n/icu-uc &/" js/moz.configure

    ''

    + extraPostPatch;



  # Ignore trivial whitespace changes in patches, this fixes compatibility of
@@ -471,8 +476,7 @@ buildStdenv.mkDerivation { 
      # MacOS builds use bundled versions of libraries: https://bugzilla.mozilla.org/show_bug.cgi?id=1776255

      "--enable-system-pixman"

      "--with-system-ffi"

      # Firefox 136 fails to link with our icu76.1

      (lib.optionalString (lib.versionOlder version "136") "--with-system-icu")

      "--with-system-icu"

      "--with-system-jpeg"

      "--with-system-libevent"

      "--with-system-libvpx"
@@ -568,7 +572,7 @@ buildStdenv.mkDerivation { 
        libdrm

      ]

    ))

    ++ lib.optionals (lib.versionOlder version "136") [ icu73 ]

    ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ]

    ++ lib.optional gssSupport libkrb5

    ++ lib.optional jemallocSupport jemalloc

    ++ extraBuildInputs;