From d54af5914808dbca8141581bf569136de1e8faf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andres=20L=C3=B6h?= <mail@andres-loeh.de>
Date: Tue, 13 May 2008 19:21:09 +0000
Subject: [PATCH] * enabled header cache support for mutt

svn path=/nixpkgs/trunk/; revision=11822
---
 .../networking/mailreaders/mutt/default.nix          | 12 +++++++++---
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index c3b4fe54d023..1191441d1b2a 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -1,23 +1,28 @@
 { stdenv, fetchurl, ncurses, which
 , sslSupport ? true
 , imapSupport ? true
+, headerCache ? true
+, gdbm ? null
 , openssl ? null
 }:
 
+assert headerCache -> gdbm != null;
 assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation {
-  name = "mutt-1.5.15";
+  name = "mutt-1.5.16";
   src = fetchurl {
-    url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.15.tar.gz;
-    sha256 = "03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a";
+    url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.16.tar.gz;
+    sha256 = "825e920b394db6f56fa8deb45977c061331f59d953944e27ff595625bbad3e83";
   };
   buildInputs = [
     ncurses which
+    (if headerCache then gdbm else null)
     (if sslSupport then openssl else null)
   ];
   configureFlags = [
     "--with-mailpath="
+    (if headerCache then "--enable-hcache" else "--disable-hcache")
     (if sslSupport then "--with-ssl" else "--without-ssl")
     (if imapSupport then "--enable-imap" else "--disable-imap")
   ];
@@ -26,3 +31,4 @@ stdenv.mkDerivation {
     homepage = http://www.mutt.org;
   };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ac624393fbd..71790b1e290b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5554,7 +5554,7 @@ let pkgs = rec {
   */
 
   mutt = import ../applications/networking/mailreaders/mutt {
-    inherit fetchurl stdenv ncurses which openssl;
+    inherit fetchurl stdenv ncurses which openssl gdbm;
   };
 
   msmtp = import ../applications/networking/msmtp {