Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vladimír Čunát
2025-05-16 19:44:50 +02:00
parent 44177144ab 9312c4398c
commit 79e569d676
2 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox/common.nix
View File

@@ -76,7 +76,7 @@ in
gnum4, gnum4,
gtk3, gtk3,
icu73, icu73,
icu77, icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides
libGL, libGL,
libGLU, libGLU,
libevent, libevent,

31
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View File

@@ -5,23 +5,28 @@
callPackage, callPackage,
fetchurl, fetchurl,
icu73, icu73,
icu77,
fetchpatch2, fetchpatch2,
config, config,
}: }:
let let
icu73' = icu73.overrideAttrs (attrs: { patchICU =
# standardize vtzone output icu:
# Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132 icu.overrideAttrs (attrs: {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1790071 # standardize vtzone output
patches = attrs.patches ++ [ # Work around ICU-22132 https://unicode-org.atlassian.net/browse/ICU-22132
(fetchpatch2 { # https://bugzilla.mozilla.org/show_bug.cgi?id=1790071
url = "https://hg.mozilla.org/mozilla-central/raw-file/fb8582f80c558000436922fb37572adcd4efeafc/intl/icu-patches/bug-1790071-ICU-22132-standardize-vtzone-output.diff"; patches = attrs.patches ++ [
stripLen = 3; (fetchpatch2 {
hash = "sha256-MGNnWix+kDNtLuACrrONDNcFxzjlUcLhesxwVZFzPAM="; 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' = patchICU icu73;
icu77' = patchICU icu77;
common = common =
{ {
@@ -52,6 +57,7 @@ let
extraPassthru = { extraPassthru = {
icu73 = icu73'; icu73 = icu73';
icu77 = icu77';
}; };
meta = with lib; { meta = with lib; {
@@ -78,6 +84,7 @@ let
pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"
icu73 = icu73'; icu73 = icu73';
icu77 = icu77';
}; };
in in