ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 18:17:21 +03:00
Code Issues Projects Releases Wiki Activity

thunderbird: 68.1.1 -> 68.2.0

Browse Source
This commit is contained in:
taku0 2019-10-23 09:23:20 +09:00
parent dd439bc01f
commit 1a211c11c4
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -25,11 +25,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec {
pname = "thunderbird";
version = "68.1.1";
version = "68.2.0";
src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "2ng5wwd7fn9247ggzlxx96scc2nalaahzvxkzvb87mp9fbfcsi3v9dh370cm42px8hrknnsp2lrfk9hqx4287zyn9pl3k9vr6a9cswl";
sha512 = "3y4wizamyyr5q73cid5m97x915w7h7sy2vcvvq7gvi39iw4mz972p0sczs9sp8fp1svf87a2kbrsv2rcsr4spf7wfmsmps50a3zr6na";
};
# from firefox, but without sound libraries
@ -52,11 +52,6 @@ in stdenv.mkDerivation rec {
patches = [
# Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch
(fetchpatch {
# https://phabricator.services.mozilla.com/D47796
url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff";
sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq";
})
]
++ lib.optional (lib.versionOlder version "69")
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
@ -141,6 +136,9 @@ in stdenv.mkDerivation rec {
gappsWrapperArgs+=(
--argv0 "$target"
--set MOZ_APP_LAUNCHER thunderbird
# See commit 87e261843c4236c541ee0113988286f77d2fa1ee
--set MOZ_LEGACY_PROFILES 1
--set MOZ_ALLOW_DOWNGRADE 1
# https://github.com/NixOS/nixpkgs/pull/61980
--set SNAP_NAME "thunderbird"
)

12
pkgs/applications/networking/mailreaders/thunderbird/no-buildconfig.patch
View File

@ -21,3 +21,15 @@ diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
content/global/buildconfig.css
content/global/contentAreaUtils.js
content/global/datepicker.xhtml
--- a/comm/mail/base/jar.mn
+++ b/comm/mail/base/jar.mn
@@ -117,9 +117,7 @@
% override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
% override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul
-* content/messenger/buildconfig.html (content/buildconfig.html)
content/messenger/buildconfig.css (content/buildconfig.css)
-% override chrome://global/content/buildconfig.html chrome://messenger/content/buildconfig.html
% override chrome://global/content/buildconfig.css chrome://messenger/content/buildconfig.css
# L10n resources and overrides.