thunderbird: 68.9.0 -> 78.0
- Updated the version and the source hash. - Removed unsupported options. - Updated the patch. - Tweaked dependencies; 78 requires newer versions.
This commit is contained in:
parent
a62d988aeb
commit
658b4d7ce5
@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true;
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "thunderbird";
|
pname = "thunderbird";
|
||||||
version = "68.10.0";
|
version = "78.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url =
|
url =
|
||||||
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
"mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
|
||||||
sha512 =
|
sha512 =
|
||||||
"24jq4wxhk58403ax8jf6p82fyzf0vszz8am5d8jb6j559da3lp6wv4m5xqavvcf9i57rdivzrmqw9agr8mypfxs8zb908aln5iy7d4d";
|
"0l5cgd95lxwny365x85pih71z7b9zgmix3wc8916k1xj5p46szr20ylf7b20gwwl7kajm4mrxjdldzmfvc9qzdyss76za5r76c25wwr";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
@ -206,14 +206,12 @@ stdenv.mkDerivation rec {
|
|||||||
in [
|
in [
|
||||||
"--enable-application=comm/mail"
|
"--enable-application=comm/mail"
|
||||||
|
|
||||||
"--with-system-bz2"
|
|
||||||
"--with-system-icu"
|
"--with-system-icu"
|
||||||
"--with-system-jpeg"
|
"--with-system-jpeg"
|
||||||
"--with-system-libevent"
|
"--with-system-libevent"
|
||||||
"--with-system-nspr"
|
"--with-system-nspr"
|
||||||
"--with-system-nss"
|
"--with-system-nss"
|
||||||
"--with-system-png" # needs APNG support
|
"--with-system-png" # needs APNG support
|
||||||
"--with-system-icu"
|
|
||||||
"--with-system-zlib"
|
"--with-system-zlib"
|
||||||
"--with-system-webp"
|
"--with-system-webp"
|
||||||
"--with-system-libvpx"
|
"--with-system-libvpx"
|
||||||
@ -223,12 +221,9 @@ stdenv.mkDerivation rec {
|
|||||||
"--enable-default-toolkit=${toolkitValue}"
|
"--enable-default-toolkit=${toolkitValue}"
|
||||||
"--enable-js-shell"
|
"--enable-js-shell"
|
||||||
"--enable-necko-wifi"
|
"--enable-necko-wifi"
|
||||||
"--enable-startup-notification"
|
|
||||||
"--enable-system-ffi"
|
"--enable-system-ffi"
|
||||||
"--enable-system-pixman"
|
"--enable-system-pixman"
|
||||||
"--enable-system-sqlite"
|
|
||||||
|
|
||||||
"--disable-gconf"
|
|
||||||
"--disable-tests"
|
"--disable-tests"
|
||||||
"--disable-updater"
|
"--disable-updater"
|
||||||
"--enable-jemalloc"
|
"--enable-jemalloc"
|
||||||
|
@ -1,31 +1,32 @@
|
|||||||
diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
|
diff -ru -x '*~' a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
|
||||||
--- a/docshell/base/nsAboutRedirector.cpp 2017-07-31 18:20:51.000000000 +0200
|
--- a/docshell/base/nsAboutRedirector.cpp
|
||||||
+++ b/docshell/base/nsAboutRedirector.cpp 2017-09-26 22:02:00.814151731 +0200
|
+++ b/docshell/base/nsAboutRedirector.cpp
|
||||||
@@ -32,8 +32,6 @@
|
@@ -63,8 +63,6 @@
|
||||||
{"about", "chrome://global/content/aboutAbout.xhtml", 0},
|
{"about", "chrome://global/content/aboutAbout.html", 0},
|
||||||
{"addons", "chrome://mozapps/content/extensions/extensions.xul",
|
{"addons", "chrome://mozapps/content/extensions/extensions.xhtml",
|
||||||
nsIAboutModule::ALLOW_SCRIPT},
|
nsIAboutModule::ALLOW_SCRIPT},
|
||||||
- {"buildconfig", "chrome://global/content/buildconfig.html",
|
- {"buildconfig", "chrome://global/content/buildconfig.html",
|
||||||
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
|
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
|
||||||
{"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml",
|
{"checkerboard", "chrome://global/content/aboutCheckerboard.html",
|
||||||
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
|
||||||
nsIAboutModule::ALLOW_SCRIPT},
|
nsIAboutModule::ALLOW_SCRIPT},
|
||||||
diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
diff -ru -x '*~' a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
||||||
--- a/toolkit/content/jar.mn 2017-07-31 18:20:52.000000000 +0200
|
--- a/toolkit/content/jar.mn
|
||||||
+++ b/toolkit/content/jar.mn 2017-09-26 22:01:42.383350314 +0200
|
+++ b/toolkit/content/jar.mn
|
||||||
@@ -39,7 +39,6 @@
|
@@ -35,7 +35,6 @@
|
||||||
content/global/plugins.css
|
content/global/plugins.js
|
||||||
content/global/browser-child.js
|
content/global/browser-child.js
|
||||||
content/global/browser-content.js
|
content/global/browser-content.js
|
||||||
-* content/global/buildconfig.html
|
-* content/global/buildconfig.html
|
||||||
content/global/buildconfig.css
|
content/global/buildconfig.css
|
||||||
content/global/contentAreaUtils.js
|
content/global/contentAreaUtils.js
|
||||||
content/global/datepicker.xhtml
|
content/global/datepicker.xhtml
|
||||||
|
diff -ru -x '*~' a/comm/mail/base/jar.mn b/comm/mail/base/jar.mn
|
||||||
--- a/comm/mail/base/jar.mn
|
--- a/comm/mail/base/jar.mn
|
||||||
+++ b/comm/mail/base/jar.mn
|
+++ b/comm/mail/base/jar.mn
|
||||||
@@ -117,9 +117,7 @@
|
@@ -119,9 +119,7 @@
|
||||||
% override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
|
% override chrome://mozapps/content/profile/profileDowngrade.js chrome://messenger/content/profileDowngrade.js
|
||||||
% override chrome://mozapps/content/profile/profileDowngrade.xul chrome://messenger/content/profileDowngrade.xul
|
% override chrome://mozapps/content/profile/profileDowngrade.xhtml chrome://messenger/content/profileDowngrade.xhtml
|
||||||
|
|
||||||
-* content/messenger/buildconfig.html (content/buildconfig.html)
|
-* content/messenger/buildconfig.html (content/buildconfig.html)
|
||||||
content/messenger/buildconfig.css (content/buildconfig.css)
|
content/messenger/buildconfig.css (content/buildconfig.css)
|
||||||
|
@ -22785,8 +22785,9 @@ in
|
|||||||
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
|
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
|
||||||
inherit (rustPackages_1_44) cargo rustc;
|
inherit (rustPackages_1_44) cargo rustc;
|
||||||
libpng = libpng_apng;
|
libpng = libpng_apng;
|
||||||
|
icu = icu67;
|
||||||
|
libvpx = libvpx_1_8;
|
||||||
gtk3Support = true;
|
gtk3Support = true;
|
||||||
nss = nss_3_44; # 68.x won't build with newest nss anymore (like firefox-esr-68)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {
|
thunderbird-68 = callPackage ../applications/networking/mailreaders/thunderbird/68.nix {
|
||||||
|
Loading…
Reference in New Issue
Block a user