mutt: fixing its gpgme support (upstream patch)

1 files changed, 9 insertions, 0 deletions

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 5364bd445e672..fa006dc5f0dbf 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -14,6 +14,13 @@ assert headerCache -> gdbm != null;
 assert sslSupport -> openssl != null;
 assert saslSupport -> cyrus_sasl != null;
 
+let
+  gpgmePatch = fetchurl {
+    # Solution for gpgme >= 1.2: http://dev.mutt.org/trac/ticket/3300
+    url = "http://dev.mutt.org/trac/raw-attachment/ticket/3300/mutt-1.5.21-gpgme-init.patch";
+    sha256 = "1qa1c8gns4q3as1h2lk3x4di2k3hr804ar7xlc6xh9r0zjhzmlk4";
+  };
+in
 stdenv.mkDerivation rec {
   name = "mutt-1.5.21";
   
@@ -22,6 +29,8 @@ stdenv.mkDerivation rec {
     sha256 = "1864cwz240gh0zy56fb47qqzwyf6ghg01037rb4p2kqgimpg6h91";
   };
 
+  patches = [ (if gpgmeSupport then gpgmePatch else null) ];
+
   buildInputs = [
     ncurses which perl
     (if headerCache then gdbm else null)