ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-29 00:27:49 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #299026 from SuperSandro2000/betterbird

Browse Source 
betterbird: 115.6.0-bb21-correct-series-take2 -> 115.9.0-bb26-build2
This commit is contained in:
Thomas Gerbet 2024-03-31 15:26:26 +02:00 committed by GitHub
commit 54f9e016e9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/applications/networking/mailreaders/betterbird/default.nix
View File

@ -12,13 +12,13 @@
let
thunderbird-unwrapped = thunderbirdPackages.thunderbird-115;
version = "115.6.0";
version = "115.9.0";
majVer = lib.versions.major version;
betterbird-patches = fetchFromGitHub {
owner = "Betterbird";
repo = "thunderbird-patches";
rev = "${version}-bb21-correct-series-take2";
rev = "${version}-bb26-build2";
postFetch = ''
echo "Retrieving external patches"
@ -36,7 +36,7 @@ let
. ./external.sh
rm external.sh
'';
hash = "sha256-YERSRyLfFTexvAYmP9qG6joQkK5fSIvU4pNLhCyIbOY=";
hash = "sha256-0RlI30zxiueeXdLEXPZevc8QyKr667juHk0bTcqBB1w=";
};
in ((buildMozillaMach {
pname = "betterbird";
@ -50,7 +50,7 @@ in ((buildMozillaMach {
src = fetchurl {
# https://download.cdn.mozilla.net/pub/thunderbird/releases/
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
hash = "sha256-Oxz5drDQ9IJVpgP4/+jiQ5Ds1b0oX8TRD+SOG6JRN0Q=";
hash = "sha256-Kut3ynA43289MG+cPSpOphWvDtzw9ykCFcpfMMEpDlc=";
};
extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ ''
@ -65,8 +65,8 @@ in ((buildMozillaMach {
cd $patches
# fix FHS paths to libdbusmenu
substituteInPlace 12-feature-linux-systray.patch \
--replace "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \
--replace "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/"
--replace-fail "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \
--replace-fail "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/"
cd -
chmod -R +w dom/base/test/gtest/
@ -78,6 +78,11 @@ in ((buildMozillaMach {
continue
fi
# requires vendored icu, fails to link with our icu
if [[ $patch == 14-feature-regexp-searchterm.patch || $patch == 14-feature-regexp-searchterm-m-c.patch ]]; then
continue
fi
echo Applying patch $patch.
if [[ $patch == *-m-c.patch ]]; then
git apply -p1 -v < $patches/$patch