nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-07 20:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

mutt-with-sidebar: simplify, fix checksum

Browse Source
This commit is contained in:
Nikolay Amiantov 2014-11-19 18:02:41 +03:00
parent a726dd7697
commit 9c658343dd
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/networking/mailreaders/mutt/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ncurses, which, perl, automake, autoconf { stdenv, fetchurl, ncurses, which, perl, autoreconfHook
, sslSupport ? true , sslSupport ? true
, imapSupport ? true , imapSupport ? true
, headerCache ? true , headerCache ? true
@ -14,6 +14,7 @@
assert headerCache -> gdbm != null; assert headerCache -> gdbm != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert saslSupport -> cyrus_sasl != null; assert saslSupport -> cyrus_sasl != null;
assert gpgmeSupport -> gpgme != null;
let let
version = "1.5.23"; version = "1.5.23";
@ -26,15 +27,14 @@ stdenv.mkDerivation rec {
sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s"; sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s";
}; };
buildInputs = [ buildInputs = with stdenv.lib;
ncurses which perl [ ncurses which perl ]
(if headerCache then gdbm else null) ++ optional headerCache gdbm
(if sslSupport then openssl else null) ++ optional sslSupport openssl
(if saslSupport then cyrus_sasl else null) ++ optional saslSupport cyrus_sasl
(if gpgmeSupport then gpgme else null) ++ optional gpgmeSupport gpgme;
]
++ (stdenv.lib.optionals withSidebar [automake autoconf]) nativeBuildInputs = stdenv.lib.optional withSidebar autoreconfHook;
;
configureFlags = [ configureFlags = [
"--with-mailpath=" "--enable-smtp" "--with-mailpath=" "--enable-smtp"
@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
patches = [] ++ patches = [] ++
(stdenv.lib.optional withSidebar (fetchurl { (stdenv.lib.optional withSidebar (fetchurl {
url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt; url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt;
sha256 = "0bq556sycl0qkr5vg5c3l16bh2bifqc2j7d64n4hw19q0ba2b45w"; sha256 = "1i2r7dj0pd1k0z3jjxn2szi6sf0k28i8dwhr4f65pn8r2lh3wisz";
})); }));
meta = with stdenv.lib; { meta = with stdenv.lib; {

1
pkgs/top-level/all-packages.nix
View File

@ -10227,7 +10227,6 @@ let
mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt = callPackage ../applications/networking/mailreaders/mutt { };
mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
withSidebar = true; withSidebar = true;
automake = automake113x;
}; };
namecoin = callPackage ../applications/misc/namecoin { }; namecoin = callPackage ../applications/misc/namecoin { };