diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-09 20:21:05 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-08-09 20:21:05 +0000 |
commit | a9daa0c0cb5916990c826a566e7bc4e052f363fc (patch) | |
tree | ef5a2ab06fd4010722866517dfdc43a539905b63 /pkgs/applications | |
parent | 48f1cd549fa40e6fc7ea74f494f3ac2c23b7a130 (diff) |
mutt-1.5.21; enable pop, imap and gpgme
openssl.patch is already merged in this version svn path=/nixpkgs/trunk/; revision=28441
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/mailreaders/mutt/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/networking/mailreaders/mutt/openssl.patch | 15 |
2 files changed, 7 insertions, 24 deletions
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index ffe4ca3271265..02870c70f6465 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, which, perl +{ stdenv, fetchurl, ncurses, which, perl, gpgme , sslSupport ? true , imapSupport ? true , headerCache ? true @@ -12,18 +12,16 @@ assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; -stdenv.mkDerivation { - name = "mutt-1.5.20"; +stdenv.mkDerivation rec { + name = "mutt-1.5.21"; src = fetchurl { - url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.20.tar.gz; - sha256 = "15m7m419r82awx4mr4nam25m0kpg0bs9vw1z4a4mrzvlkl3zqycm"; + url = "ftp://ftp.mutt.org/mutt/devel/${name}.tar.gz"; + sha256 = "1864cwz240gh0zy56fb47qqzwyf6ghg01037rb4p2kqgimpg6h91"; }; - patches = [ ./openssl.patch ]; - buildInputs = [ - ncurses which perl + ncurses which perl gpgme (if headerCache then gdbm else null) (if sslSupport then openssl else null) (if saslSupport then cyrus_sasl else null) @@ -33,7 +31,7 @@ stdenv.mkDerivation { "--with-mailpath=" "--enable-smtp" # This allows calls with "-d N", that output debug info into ~/.muttdebug* - "--enable-debug" + "--enable-debug" "--enable-pop" "--enable-imap" "--enable-gpgme" # The next allows building mutt without having anything setgid # set by the installer, and removing the need for the group 'mail' diff --git a/pkgs/applications/networking/mailreaders/mutt/openssl.patch b/pkgs/applications/networking/mailreaders/mutt/openssl.patch deleted file mode 100644 index 6476075d67dee..0000000000000 --- a/pkgs/applications/networking/mailreaders/mutt/openssl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fixes a compilation problem with OpenSSL 1.0.0. -From http://www.freebsd.org/cgi/query-pr.cgi?pr=146261 - -diff -ru -x '*~' mutt-1.5.20-orig/mutt_ssl.c mutt-1.5.20/mutt_ssl.c ---- mutt-1.5.20-orig/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200 -+++ mutt-1.5.20/mutt_ssl.c 2010-07-24 10:46:08.000000000 +0200 -@@ -652,7 +652,7 @@ - char *buf = NULL; - int bufsize; - /* needed to get the DNS subjectAltNames: */ -- STACK *subj_alt_names; -+ STACK_OF(GENERAL_NAME) *subj_alt_names; - int subj_alt_names_count; - GENERAL_NAME *subj_alt_name; - /* did we find a name matching hostname? */ |