thunderbird: Update to 15.0.1
This commit is contained in:
parent
d9c01ef51d
commit
29aa7abe87
|
@ -2,6 +2,7 @@
|
||||||
, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
|
, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
|
||||||
, libnotify, cairo, pixman, fontconfig
|
, libnotify, cairo, pixman, fontconfig
|
||||||
, libjpeg
|
, libjpeg
|
||||||
|
, pythonPackages
|
||||||
|
|
||||||
, # If you want the resulting program to call itself "Thunderbird"
|
, # If you want the resulting program to call itself "Thunderbird"
|
||||||
# instead of "Shredder", enable this option. However, those
|
# instead of "Shredder", enable this option. However, those
|
||||||
|
@ -9,47 +10,26 @@
|
||||||
# Mozilla Foundation, see
|
# Mozilla Foundation, see
|
||||||
# http://www.mozilla.org/foundation/trademarks/.
|
# http://www.mozilla.org/foundation/trademarks/.
|
||||||
enableOfficialBranding ? false
|
enableOfficialBranding ? false
|
||||||
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let version = "11.0.1";
|
let version = "15.0.1"; in
|
||||||
|
|
||||||
# This patch may become necessary when we use a more recent version of libpng
|
|
||||||
# for now, it's actually not needed
|
|
||||||
# pngPatch = fetchurl {
|
|
||||||
# url = http://www.linuxfromscratch.org/patches/blfs/svn/thunderbird-9.0.1-libpng-1.5-1.patch;
|
|
||||||
# sha256 = "8454bdde3be8dc37c9f5e6f597914f0a585ff4b357d3fc86c6c9f80208b6068d";
|
|
||||||
# };
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "thunderbird-${version}";
|
name = "thunderbird-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/11.0.1/source/thunderbird-${version}.source.tar.bz2";
|
url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.bz2";
|
||||||
sha1 = "037344b451b1c031472d92f96d401b15d8e3e7d3";
|
sha1 = "688bed2b48abda000b489f3c84de0ba9f93818f0";
|
||||||
};
|
};
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
|
[ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
|
||||||
libnotify cairo pixman fontconfig yasm mesa /* nss */
|
libnotify cairo pixman fontconfig yasm mesa nss
|
||||||
libjpeg
|
libjpeg pythonPackages.sqlite3
|
||||||
];
|
];
|
||||||
|
|
||||||
# fix some paths in pngPatch
|
|
||||||
# prePatch = ''
|
|
||||||
# substitute ${pngPatch} png.patch --replace "mozilla-release/modules/" "comm-release/mozilla/modules/"
|
|
||||||
# '';
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# "png.patch" # produced by postUnpack
|
|
||||||
|
|
||||||
# Fix weird dependencies such as a so file which depends on "-lpthread".
|
|
||||||
# ./thunderbird-build-deps.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
[ "--enable-application=mail"
|
[ "--enable-application=mail"
|
||||||
"--enable-optimize"
|
"--enable-optimize"
|
||||||
|
@ -58,11 +38,13 @@ stdenv.mkDerivation {
|
||||||
"--enable-strip"
|
"--enable-strip"
|
||||||
"--with-pthreads"
|
"--with-pthreads"
|
||||||
"--with-system-jpeg"
|
"--with-system-jpeg"
|
||||||
# "--with-system-png" # png 1.5.x not merged in nixpkgs yet
|
#"--with-system-png"
|
||||||
"--with-system-zlib"
|
"--with-system-zlib"
|
||||||
"--with-system-bz2"
|
"--with-system-bz2"
|
||||||
"--with-system-nspr"
|
"--with-system-nspr"
|
||||||
"--enable-system-cairo"
|
"--with-system-nss"
|
||||||
|
# Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975
|
||||||
|
#"--enable-system-cairo"
|
||||||
"--disable-crashreporter"
|
"--disable-crashreporter"
|
||||||
"--disable-necko-wifi"
|
"--disable-necko-wifi"
|
||||||
"--disable-webm"
|
"--disable-webm"
|
||||||
|
@ -84,10 +66,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
postInstall =
|
postInstall =
|
||||||
''
|
''
|
||||||
# Fix some references to /bin paths in the Xulrunner shell script.
|
rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl
|
||||||
substituteInPlace $out/lib/thunderbird-*/thunderbird \
|
|
||||||
--replace /bin/pwd "$(type -tP pwd)" \
|
|
||||||
--replace /bin/ls "$(type -tP ls)"
|
|
||||||
|
|
||||||
# Create a desktop item.
|
# Create a desktop item.
|
||||||
mkdir -p $out/share/applications
|
mkdir -p $out/share/applications
|
||||||
|
@ -109,7 +88,7 @@ stdenv.mkDerivation {
|
||||||
# Official branding implies thunderbird name and logo cannot be reuse,
|
# Official branding implies thunderbird name and logo cannot be reuse,
|
||||||
# see http://www.mozilla.org/foundation/licensing.html
|
# see http://www.mozilla.org/foundation/licensing.html
|
||||||
if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
|
if enableOfficialBranding then licenses.proprietary else licenses.mpl11;
|
||||||
maintainers = with maintainers; [ pierron ];
|
maintainers = maintainers.pierron;
|
||||||
platforms = with platforms; linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
|
@ -7763,7 +7763,7 @@ let
|
||||||
|
|
||||||
thinkingRock = callPackage ../applications/misc/thinking-rock { };
|
thinkingRock = callPackage ../applications/misc/thinking-rock { };
|
||||||
|
|
||||||
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/11.x.nix {
|
thunderbird = callPackage ../applications/networking/mailreaders/thunderbird/15.x.nix {
|
||||||
inherit (gnome) libIDL;
|
inherit (gnome) libIDL;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue