Add mutt sidebar patch — Fixes #3222 (a PR by Leon Waldman)
This commit is contained in:
parent
66dfae3d26
commit
41ff7d75fd
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, ncurses, which, perl
|
||||
{ stdenv, fetchurl, ncurses, which, perl, automake, autoconf
|
||||
, sslSupport ? true
|
||||
, imapSupport ? true
|
||||
, headerCache ? true
|
||||
@ -8,6 +8,7 @@
|
||||
, openssl ? null
|
||||
, cyrus_sasl ? null
|
||||
, gpgme ? null
|
||||
, withSidebar ? false
|
||||
}:
|
||||
|
||||
assert headerCache -> gdbm != null;
|
||||
@ -18,10 +19,10 @@ let
|
||||
version = "1.5.23";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mutt-${version}";
|
||||
|
||||
name = "mutt${stdenv.lib.optionalString withSidebar "-with-sidebar"}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/mutt/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/mutt/mutt-${version}.tar.gz";
|
||||
sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
|
||||
};
|
||||
|
||||
@ -31,8 +32,10 @@ stdenv.mkDerivation rec {
|
||||
(if sslSupport then openssl else null)
|
||||
(if saslSupport then cyrus_sasl else null)
|
||||
(if gpgmeSupport then gpgme else null)
|
||||
];
|
||||
|
||||
]
|
||||
++ (stdenv.lib.optionals withSidebar [automake autoconf])
|
||||
;
|
||||
|
||||
configureFlags = [
|
||||
"--with-mailpath=" "--enable-smtp"
|
||||
|
||||
@ -52,6 +55,13 @@ stdenv.mkDerivation rec {
|
||||
(if gpgmeSupport then "--enable-gpgme" else "--disable-gpgme")
|
||||
];
|
||||
|
||||
# Adding the sidebar
|
||||
patches = [] ++
|
||||
(stdenv.lib.optional withSidebar (fetchurl {
|
||||
url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt;
|
||||
sha256 = "0bq556sycl0qkr5vg5c3l16bh2bifqc2j7d64n4hw19q0ba2b45w";
|
||||
}));
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A small but very powerful text-based mail client";
|
||||
homepage = http://www.mutt.org;
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -r 8f62001989cc configure.ac
|
||||
--- a/configure.ac Sat Feb 08 10:24:22 2014 -0800
|
||||
+++ b/configure.ac Wed Jul 02 12:34:40 2014 +0200
|
||||
@@ -473,6 +473,8 @@
|
||||
mutt_cv_mailpath=/usr/spool/mail
|
||||
elif test -d /usr/mail; then
|
||||
mutt_cv_mailpath=/usr/mail
|
||||
+ elif test -d /tmp; then
|
||||
+ mutt_cv_mailpath=/tmp
|
||||
fi])
|
||||
])
|
||||
if test "$mutt_cv_mailpath" = no; then
|
@ -10196,6 +10196,10 @@ let
|
||||
musescore = callPackage ../applications/audio/musescore { };
|
||||
|
||||
mutt = callPackage ../applications/networking/mailreaders/mutt { };
|
||||
mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
|
||||
withSidebar = true;
|
||||
automake = automake113x;
|
||||
};
|
||||
|
||||
namecoin = callPackage ../applications/misc/namecoin { };
|
||||
namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { };
|
||||
|
Loading…
x
Reference in New Issue
Block a user