diff options
author | John Wiegley <johnw@newartisans.com> | 2014-07-04 15:48:14 -0500 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2014-07-04 15:48:14 -0500 |
commit | 67e4df75dd361b2af34d3abbb0f174dada692fac (patch) | |
tree | 33bfbe86dd94483983f551ac8fb076067407dd14 /pkgs/applications/networking/mailreaders | |
parent | 01d9778625fe6b7e68f71c869e43fae0e6673f72 (diff) | |
download | nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.tar nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.tar.gz nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.tar.bz2 nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.tar.lz nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.tar.xz nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.tar.zst nixlib-67e4df75dd361b2af34d3abbb0f174dada692fac.zip |
Revert "mutt: update to 1.5.23"
This reverts commit 6a7d60c01a22e83d625506b7cc9243b8da41656a.
Diffstat (limited to 'pkgs/applications/networking/mailreaders')
-rw-r--r-- | pkgs/applications/networking/mailreaders/mutt/default.nix | 76 |
1 files changed, 41 insertions, 35 deletions
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 1cb7f298e206..dbd5a41afd34 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,57 +1,63 @@ -{ stdenv, fetchhg, autoconf, automake, ncurses, which -, perl, gdbm, openssl, cyrus_sasl, gpgme, libidn }: +{ stdenv, fetchurl, ncurses, which, perl +, 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 { - url = "http://dev.mutt.org/hg/mutt/"; - rev = "mutt-${version}"; - sha256 = "1m0aif066lsc0936ha9s1kfx63wsl1l1wiib7ax6xgzijawd80pp"; + src = fetchurl { + url = "mirror://sourceforge/mutt/${name}.tar.gz"; + sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s"; }; - enableParallelBuilding = true; - buildInputs = [ - autoconf automake ncurses which perl - gdbm openssl cyrus_sasl gpgme libidn - ]; - - # 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 + ncurses which perl + (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) ]; - - 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" - "--with-regex" - "--with-ssl" - "--with-sasl" + + "--enable-pop" "--enable-imap" + + # The next allows building mutt without having anything setgid + # 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 ]; }; } |