Unverified Commit c162f76a authored by h7x4's avatar h7x4 Committed by GitHub
Browse files

betterbird: apply icu patch from thunderbird (#344071)

parents 04f8ead0 febd2e6c

pkgs/applications/networking/mailreaders/betterbird/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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

pkgs/applications/networking/mailreaders/thunderbird/packages.nix

+17 −11
Original line number Diff line number Diff line 
{ 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 {