public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

thunderbird: 60.8.0 -> 68.0

Browse Source
This commit is contained in:
taku0 2019-08-29 20:56:24 +09:00
parent 6007f737e1
commit ac84c1ebde
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python2, python3, nodejs
, libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , libIDL, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify , freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip , yasm, libGLU_combined, sqlite, zip, unzip
, hunspell, libevent, libstartup_notification , libevent, libstartup_notification
, icu, libpng, jemalloc , icu, libpng, jemalloc
, autoconf213, which, m4 , autoconf213, which, m4, fetchpatch
, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl, runtimeShell , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
, cargo, rustc, llvmPackages , runtimeShell
, cargo, rustc, rust-cbindgen, llvmPackages, nasm
, enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper
, enableCalendar ? true , enableCalendar ? true
, debugBuild ? false , debugBuild ? false
@ -24,11 +25,11 @@ let
gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "thunderbird-${version}"; name = "thunderbird-${version}";
version = "60.8.0"; version = "68.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
sha512 = "1cd1ps4r70bnxn9kydljsp776dazfzfsghc5zwp1xz6p3cwb9g0gybj677sac7y3ma2wsq1xbqk20q35n7gjz3k1zzhmpxyii558rdl"; sha512 = "2cz583rwfpj4z5cwg2vfy4ha0pz4xs9g7li078rmk6x19haiv8s9fwijd82xgxax0afn8wk80bq5kd8yz38l9432f6bar8xnwb21y4i";
}; };
# from firefox, but without sound libraries # from firefox, but without sound libraries
@ -39,26 +40,25 @@ in stdenv.mkDerivation rec {
nspr nss libnotify xorg.pixman yasm libGLU_combined nspr nss libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.xorgproto xorg.libXScrnSaver xorg.xorgproto
xorg.libXext sqlite unzip xorg.libXext sqlite unzip
hunspell libevent libstartup_notification /* cairo */ libevent libstartup_notification /* cairo */
icu libpng jemalloc icu libpng jemalloc nasm
] ]
++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ]; ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
# from firefox + m4 + wrapperTool # from firefox + m4 + wrapperTool
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; # llvm is for llvm-objdump
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python2 python3 nodejs wrapperTool cargo rustc rust-cbindgen llvmPackages.llvm ];
patches = [ patches = [
# Remove buildconfig.html to prevent a dependency on clang etc. # Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch ./no-buildconfig.patch
]
# Needed on older branches since rustc: 1.32.0 -> 1.33.0 ++ lib.optional (lib.versionOlder version "69")
(fetchurl { (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29
name = "missing-documentation.patch"; name = "write_error-parallel_make.diff";
url = "https://aur.archlinux.org/cgit/aur.git/plain/deny_missing_docs.patch" url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py";
+ "?h=firefox-esr&id=03bdd01f9cf"; sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y";
sha256 = "1i33n3fgwc8d0v7j4qn7lbdax0an6swar12gay3q2nwrhg3ic4fb"; });
})
];
configureFlags = configureFlags =
[ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio)
@ -76,7 +76,6 @@ in stdenv.mkDerivation rec {
"--with-system-icu" "--with-system-icu"
#"--enable-rust-simd" # not supported since rustc 1.32.0 -> 1.33.0; TODO: probably OK since 68.0.0 #"--enable-rust-simd" # not supported since rustc 1.32.0 -> 1.33.0; TODO: probably OK since 68.0.0
"--enable-system-ffi" "--enable-system-ffi"
"--enable-system-hunspell"
"--enable-system-pixman" "--enable-system-pixman"
"--enable-system-sqlite" "--enable-system-sqlite"
#"--enable-system-cairo" #"--enable-system-cairo"
@ -114,6 +113,9 @@ in stdenv.mkDerivation rec {
configureScript="$(realpath ./configure)" configureScript="$(realpath ./configure)"
mkdir ../objdir mkdir ../objdir
cd ../objdir cd ../objdir
# AS=as in the environment causes build failure https://bugzilla.mozilla.org/show_bug.cgi?id=1497286
unset AS
''; '';
dontWrapGApps = true; # we do it ourselves dontWrapGApps = true; # we do it ourselves
@ -134,6 +136,8 @@ in stdenv.mkDerivation rec {
gappsWrapperArgs+=( gappsWrapperArgs+=(
--argv0 "$target" --argv0 "$target"
--set MOZ_APP_LAUNCHER thunderbird --set MOZ_APP_LAUNCHER thunderbird
# https://github.com/NixOS/nixpkgs/pull/61980
--set SNAP_NAME "thunderbird"
) )
${ ${
# We wrap manually because wrapGAppsHook does not detect the symlink # We wrap manually because wrapGAppsHook does not detect the symlink