mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 19:51:17 +00:00
Code Issues Wiki Activity

betterbird: apply icu patch from thunderbird (#344071)

Browse source
This commit is contained in:
h7x4 2024-09-30 08:38:52 +02:00 committed by GitHub
parent 04f8ead0e8 febd2e6c30
commit c162f76ae1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/mailreaders/betterbird/default.nix
View file

@ -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

28
pkgs/applications/networking/mailreaders/thunderbird/packages.nix
View file

@ -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 {