Merge pull request #9915 from khumba/claws-mime-fix

claws-mail: fix attachment MIME detection, enable parallel build

lethalman 60d1c0cf f1733ab5

Changed files
+21 -1
pkgs
applications
networking
mailreaders
claws-mail
+7 -1
pkgs/applications/networking/mailreaders/claws-mail/default.nix
···
{ fetchurl, stdenv
, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive
, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap
-
, perl, pkgconfig, poppler, python, webkitgtk2
# Build options
# TODO: A flag to build the manual.
···
sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw";
};
buildInputs =
[ curl dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ]
++ optional enableSpellcheck enchant
···
++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin"
++ optional (!enableSpellcheck) "--disable-enchant";
postInstall = ''
mkdir -p $out/share/applications
cp claws-mail.desktop $out/share/applications
'';
}
···
{ fetchurl, stdenv
, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, libarchive
, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager, openldap
+
, perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2
# Build options
# TODO: A flag to build the manual.
···
sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw";
};
+
patches = [ ./mime.patch ];
+
buildInputs =
[ curl dbus dbus_glib gtk gnutls libetpan perl pkgconfig python ]
++ optional enableSpellcheck enchant
···
++ optional (!enablePluginVcalendar) "--disable-vcalendar-plugin"
++ optional (!enableSpellcheck) "--disable-enchant";
+
enableParallelBuilding = true;
+
postInstall = ''
mkdir -p $out/share/applications
cp claws-mail.desktop $out/share/applications
+
+
ln -sT ${shared_mime_info}/share/mime $out/share/mime
'';
}
+14
pkgs/applications/networking/mailreaders/claws-mail/mime.patch
···
···
+
--- a/src/procmime.c 2015-09-18 04:03:11.767654094 -0700
+
+++ b/src/procmime.c 2015-09-18 04:08:38.834503034 -0700
+
@@ -1196,11 +1196,7 @@
+
if (mime_type_list)
+
return mime_type_list;
+
+
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
+
if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
+
-#else
+
- if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL)
+
-#endif
+
{
+
fp_is_glob_file = FALSE;
+
if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) {