From b4a69dcb47db8026496ef128a2962dd17996f67f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Sep 2024 23:58:59 +0200 Subject: [PATCH 1/2] thunderbird: expose icu patch in passthru to be used by betterbird --- .../mailreaders/thunderbird/packages.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 6b13616ee1a5..ba06acddadf0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,6 +1,17 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu73, fetchpatch2, config }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, icu73, fetchpatch2, config }: let + icu73' = icu73.overrideAttrs (attrs: { + # standardize vtzone output + # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 + patches = attrs.patches ++ [(fetchpatch2 { + url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; + stripLen = 3; + hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; + })]; + }); + common = { version, sha512, updateScript }: (buildMozillaMach rec { pname = "thunderbird"; inherit version updateScript; @@ -16,6 +27,10 @@ let ./no-buildconfig.patch ]; + extraPassthru = { + icu73 = icu73'; + }; + meta = with lib; { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Full-featured e-mail client"; @@ -34,16 +49,7 @@ let pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" - icu73 = icu73.overrideAttrs (attrs: { - # standardize vtzone output - # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 - patches = attrs.patches ++ [(fetchpatch2 { - url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; - stripLen = 3; - hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; - })]; - }); + icu73 = icu73'; }; in rec { From febd2e6c309275008c946c73d758398c84137844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 23 Sep 2024 23:59:16 +0200 Subject: [PATCH 2/2] betterbird: apply icu patch from thunderbird --- pkgs/applications/networking/mailreaders/betterbird/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix index b479a01d0d4c..38ff368ad5fd 100644 --- a/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -112,6 +112,8 @@ in ((buildMozillaMach { webrtcSupport = false; pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" + + inherit (thunderbird-unwrapped.passthru) icu73; }).overrideAttrs (oldAttrs: { postInstall = oldAttrs.postInstall or "" + '' mv $out/lib/thunderbird/* $out/lib/betterbird