philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Merge pull request #10191 from khumba/claws-mail-3.12.0

Browse source 
claws-mail: 3.11.1 -> 3.12.0, remove priority workaround
This commit is contained in:
Arseniy Seroka 2015-10-03 13:07:56 +03:00
commit e4f0e0e50a
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View file

@ -29,7 +29,7 @@
with stdenv.lib; with stdenv.lib;
let version = "3.11.1"; in let version = "3.12.0"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "claws-mail-${version}"; name = "claws-mail-${version}";
@ -40,16 +40,20 @@ stdenv.mkDerivation {
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.khumba ]; maintainers = [ maintainers.khumba ];
priority = 10; # Resolve the conflict with the share/mime link we create.
}; };
src = fetchurl { src = fetchurl {
url = "http://downloads.sourceforge.net/project/claws-mail/Claws%20Mail/${version}/claws-mail-${version}.tar.bz2"; url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-3.12.0.tar.xz";
sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw"; sha256 = "1jnnwivpcplv8x4w0ibb1qcnasl37fr53lbfybhgb936l2mdcai7";
}; };
patches = [ ./mime.patch ]; patches = [ ./mime.patch ];
postPatch = ''
substituteInPlace src/procmime.c \
--subst-var-by MIMEROOTDIR ${shared_mime_info}/share
'';
buildInputs = buildInputs =
[ curl dbus dbus_glib gtk gnutls hicolor_icon_theme [ curl dbus dbus_glib gtk gnutls hicolor_icon_theme
libetpan perl pkgconfig python libetpan perl pkgconfig python
@ -90,7 +94,5 @@ stdenv.mkDerivation {
postInstall = '' postInstall = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp claws-mail.desktop $out/share/applications cp claws-mail.desktop $out/share/applications
ln -sT ${shared_mime_info}/share/mime $out/share/mime
''; '';
} }

7
pkgs/applications/networking/mailreaders/claws-mail/mime.patch
View file

@ -1,14 +1,15 @@
--- a/src/procmime.c 2015-09-18 04:03:11.767654094 -0700 --- a/src/procmime.c 2015-10-01 23:02:16.629908590 -0700
+++ b/src/procmime.c 2015-09-18 04:08:38.834503034 -0700 +++ b/src/procmime.c 2015-10-01 23:02:46.932001337 -0700
@@ -1196,11 +1196,7 @@ @@ -1196,11 +1196,7 @@
if (mime_type_list) if (mime_type_list)
return mime_type_list; return mime_type_list;
-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) - if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL)
-#else -#else
- if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL) - if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL)
-#endif -#endif
+ if ((fp = procmime_fopen("@MIMEROOTDIR@/mime/globs", "rb")) == NULL)
{ {
fp_is_glob_file = FALSE; fp_is_glob_file = FALSE;
if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) { if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) {