From fe8579492b9c1a6baf62475ac42a1f82faecc1fa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 13 Jul 2023 08:45:59 +0800 Subject: [PATCH] thunderbirdPackages.thunderbird-115: patch icu for issues with non-compliant VTIMEZONE --- .../networking/mailreaders/thunderbird/packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 03648b0c6ff2..3a13620a8587 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests }: +{ stdenv, lib, buildMozillaMach, callPackage, fetchurl, fetchpatch, nixosTests, icu, fetchpatch2 }: rec { thunderbird = thunderbird-115; @@ -75,5 +75,16 @@ rec { webrtcSupport = false; pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" + + icu = icu.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="; + })]; + }); }; }