Unverified Commit c46c1bba authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

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

parents abf9d678 9312c439

pkgs/applications/networking/browsers/firefox/common.nix

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ in 
  gnum4,

  gtk3,

  icu73,

  icu77,

  icu77, # if you fiddle with the icu parameters, please check Thunderbird's overrides

  libGL,

  libGLU,

  libevent,

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

+19 −12
Original line number Diff line number Diff line
@@ -5,12 +5,15 @@ 
  callPackage,

  fetchurl,

  icu73,

  icu77,

  fetchpatch2,

  config,

}:



let

  icu73' = icu73.overrideAttrs (attrs: {

  patchICU =

    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
@@ -22,6 +25,8 @@ let 
        })

      ];

    });

  icu73' = patchICU icu73;

  icu77' = patchICU icu77;



  common =

    {
@@ -52,6 +57,7 @@ let 


      extraPassthru = {

        icu73 = icu73';

        icu77 = icu77';

      };



      meta = with lib; {
@@ -78,6 +84,7 @@ let 
        pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable"



        icu73 = icu73';

        icu77 = icu77';

      };



in