From ec8f2bdc1be06e33ff28440570aa788fc1a0348d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 12 Apr 2010 22:21:01 +0000 Subject: [PATCH] Adding sasl support to mutt, so ssmtp sending works svn path=/nixpkgs/trunk/; revision=21038 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index dce79c0f4c7..86e6873f4b4 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -2,12 +2,15 @@ , sslSupport ? true , imapSupport ? true , headerCache ? true +, saslSupport ? true , gdbm ? null , openssl ? null +, cyrus_sasl ? null }: assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; +assert saslSupport -> cyrus_sasl != null; stdenv.mkDerivation { name = "mutt-1.5.20"; @@ -19,6 +22,7 @@ stdenv.mkDerivation { ncurses which perl (if headerCache then gdbm else null) (if sslSupport then openssl else null) + (if saslSupport then cyrus_sasl else null) ]; configureFlags = [ "--with-mailpath=" "--enable-smtp" @@ -29,6 +33,7 @@ stdenv.mkDerivation { (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-imap") ]; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0c7797cbd5..c29db9220e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7798,7 +7798,7 @@ let }; mutt = import ../applications/networking/mailreaders/mutt { - inherit fetchurl stdenv ncurses which openssl gdbm perl; + inherit fetchurl stdenv ncurses which openssl gdbm perl cyrus_sasl; }; msmtp = import ../applications/networking/msmtp {