From 2eb8cbeb784198e7970370869f4b34aa777783ba Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 9 Jan 2026 22:05:13 +0100 Subject: [PATCH] buildMozillaMach: use icu 78 for firefox 147 and newer --- .../networking/mailreaders/thunderbird/packages.nix | 8 ++++---- pkgs/build-support/build-mozilla-mach/default.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index afa4f1ce54f2..046d9d5eaf15 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -4,8 +4,8 @@ buildMozillaMach, callPackage, fetchurl, - icu73, icu77, + icu78, fetchpatch2, config, }: @@ -25,8 +25,8 @@ let }) ]; }); - icu73' = patchICU icu73; icu77' = patchICU icu77; + icu78' = patchICU icu78; common = { @@ -49,8 +49,8 @@ let (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch) ]; extraPassthru = { - icu73 = icu73'; icu77 = icu77'; + icu78 = icu78'; }; meta = { @@ -77,8 +77,8 @@ let pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu73 = icu73'; icu77 = icu77'; + icu78 = icu78'; }; in diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 2c1276a886e6..58502c3ed32f 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -76,8 +76,8 @@ in glib, gnum4, gtk3, - icu73, icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides + icu78, libGL, libGLU, libevent, @@ -581,7 +581,7 @@ buildStdenv.mkDerivation { libdrm ] )) - ++ [ (if (lib.versionAtLeast version "138") then icu77 else icu73) ] + ++ [ (if (lib.versionAtLeast version "147") then icu78 else icu77) ] ++ lib.optional gssSupport libkrb5 ++ lib.optional jemallocSupport jemalloc ++ extraBuildInputs;