From e539c80d47168b6d8709cc7a753952b9e8878fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Mon, 6 Aug 2007 12:18:55 +0000 Subject: [PATCH] * add SSL and IMAP support to mutt svn path=/nixpkgs/trunk/; revision=9056 --- .../networking/mailreaders/mutt/default.nix | 19 ++++++++++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index adb6eb917f38..6b10cfc04a29 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,10 @@ -{stdenv, fetchurl, ncurses, which}: +{ stdenv, fetchurl, ncurses, which +, sslSupport ? true +, imapSupport ? true +, openssl ? null +}: + +assert sslSupport -> openssl != null; stdenv.mkDerivation { name = "mutt-1.5.15"; @@ -6,6 +12,13 @@ stdenv.mkDerivation { url = ftp://ftp.mutt.org/mutt/devel/mutt-1.5.15.tar.gz; sha256 = "03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a"; }; - buildInputs = [ ncurses which ]; - configureFlags = "--with-mailpath=/invalid"; + buildInputs = [ + ncurses which + (if sslSupport then openssl else null) + ]; + configureFlags = [ + "--with-mailpath=" + (if sslSupport then "--with-ssl" else "--without-ssl") + (if imapSupport then "--enable-imap" else "--disable-imap") + ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 198a4296ea02..d29df868dea2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -466,7 +466,7 @@ rec { }; mutt = import ../applications/networking/mailreaders/mutt { - inherit fetchurl stdenv ncurses which; + inherit fetchurl stdenv ncurses which openssl; }; ncat = import ../tools/networking/ncat {