thunderbird: fix calendar again after icu77 switch (#407537)

+20 -13
+1 -1
pkgs/applications/networking/browsers/firefox/common.nix
··· 76 76 gnum4, 77 77 gtk3, 78 78 icu73, 79 - icu77, 79 + icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides 80 80 libGL, 81 81 libGLU, 82 82 libevent,
+19 -12
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
··· 5 5 callPackage, 6 6 fetchurl, 7 7 icu73, 8 + icu77, 8 9 fetchpatch2, 9 10 config, 10 11 }: 11 12 12 13 let 13 - icu73' = icu73.overrideAttrs (attrs: { 14 - # standardize vtzone output 15 - # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 16 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 17 - patches = attrs.patches ++ [ 18 - (fetchpatch2 { 19 - url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; 20 - stripLen = 3; 21 - hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; 22 - }) 23 - ]; 24 - }); 14 + patchICU = 15 + icu: 16 + icu.overrideAttrs (attrs: { 17 + # standardize vtzone output 18 + # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 19 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 20 + patches = attrs.patches ++ [ 21 + (fetchpatch2 { 22 + url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; 23 + stripLen = 3; 24 + hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; 25 + }) 26 + ]; 27 + }); 28 + icu73' = patchICU icu73; 29 + icu77' = patchICU icu77; 25 30 26 31 common = 27 32 { ··· 52 57 53 58 extraPassthru = { 54 59 icu73 = icu73'; 60 + icu77 = icu77'; 55 61 }; 56 62 57 63 meta = with lib; { ··· 78 84 pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" 79 85 80 86 icu73 = icu73'; 87 + icu77 = icu77'; 81 88 }; 82 89 83 90 in