Revert "mutt: update to 1.5.23"

This reverts commit 6a7d60c01a.

pkgs/applications/networking/mailreaders/mutt/default.nix

@@ -1,57 +1,63 @@
-{ stdenv, fetchhg, autoconf, automake, ncurses, which
+{ stdenv, fetchurl, ncurses, which, perl
-, perl, gdbm, openssl, cyrus_sasl, gpgme, libidn }:
+, sslSupport ? true
+, imapSupport ? true
+, headerCache ? true
+, saslSupport ? true
+, gpgmeSupport ? true
+, gdbm ? null
+, openssl ? null
+, cyrus_sasl ? null
+, gpgme ? null
+}:
+
+assert headerCache -> gdbm != null;
+assert sslSupport -> openssl != null;
+assert saslSupport -> cyrus_sasl != null;
 
 let
-  version = "1.5.23-rel";
+  version = "1.5.23";
 in
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
   
-  src = fetchhg {
+  src = fetchurl {
-    url = "http://dev.mutt.org/hg/mutt/";
+    url = "mirror://sourceforge/mutt/${name}.tar.gz";
-    rev = "mutt-${version}";
+    sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
-    sha256 =  "1m0aif066lsc0936ha9s1kfx63wsl1l1wiib7ax6xgzijawd80pp";
   };
 
-  enableParallelBuilding = true;
-
   buildInputs = [
-    autoconf automake ncurses which perl
+    ncurses which perl
-    gdbm openssl cyrus_sasl gpgme libidn
+    (if headerCache then gdbm else null)
+    (if sslSupport then openssl else null)
+    (if saslSupport then cyrus_sasl else null)
+    (if gpgmeSupport then gpgme else null)
   ];
-
+  
-  # This patch is necessary, because during the configure phase mutt
-  # searches for some paths to store mail in that do not exist on
-  # NixOS, like /var/mail, /usr/mail and similiar. This patch adds
-  # /tmp to the list.
-  patches = [
-    ./mailpath.patch
-  ];
-
-  preConfigure = ''./prepare'';
-
   configureFlags = [
-    "--prefix=$out"
+    "--with-mailpath=" "--enable-smtp"
 
+    # This allows calls with "-d N", that output debug info into ~/.muttdebug*
     "--enable-debug"
-    "--enable-gpgme"
-    "--enable-hcache"
-    "--enable-imap"
-    "--enable-pop"
-    "--enable-smtp"
 
-    "--with-idn"
+    "--enable-pop" "--enable-imap"
-    "--with-regex"
+
-    "--with-ssl"
+    # The next allows building mutt without having anything setgid
-    "--with-sasl"
+    # set by the installer, and removing the need for the group 'mail'
+    # I set the value 'mailbox' because it is a default in the configure script
+    "--with-homespool=mailbox"
+    (if headerCache then "--enable-hcache" else "--disable-hcache")
+    (if sslSupport then "--with-ssl" else "--without-ssl")
+    (if imapSupport then "--enable-imap" else "--disable-imap")
+    (if saslSupport then "--with-sasl" else "--without-sasl")
+    (if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
   ];
-   
+
   meta = with stdenv.lib; {
     description = "A small but very powerful text-based mail client";
     homepage = http://www.mutt.org;
     license = "GPLv2+";
     platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny _1126 ];
+    maintainers = with maintainers; [ the-kenny ];
   };
 }