neomutt: 20171208 -> 20171215

The build system also changed to the tcl based "autosetup".
This commit is contained in:
Peter Hoeg 2018-02-15 22:58:49 +08:00
parent 34fa5d2d80
commit 8d7b069ea6
1 changed files with 12 additions and 16 deletions

View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, which, autoreconfHook, makeWrapper, writeScript, { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript
ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl
lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }: , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mime-types }:
let let
muttWrapper = writeScript "mutt" '' muttWrapper = writeScript "mutt" ''
@ -15,14 +15,14 @@ let
''; '';
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "20171208"; version = "20171215";
name = "neomutt-${version}"; name = "neomutt-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neomutt"; owner = "neomutt";
repo = "neomutt"; repo = "neomutt";
rev = "neomutt-${version}"; rev = "neomutt-${version}";
sha256 = "1fn28q4akfz0nq3ysp8n53j8yqp2mx6yhbvb59c4zm6zgd4qzgp1"; sha256 = "1c7vjl5cl0k41vrxp6l1sj72idz70r2rgaxa2m1yir6zb6qsrsd8";
}; };
buildInputs = [ buildInputs = [
@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which makeWrapper docbook_xsl docbook_xml_dtd_42 gettext libxslt.bin makeWrapper tcl which
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -51,18 +51,14 @@ in stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--enable-debug" "--gpgme"
"--enable-gpgme" "--gss"
"--enable-notmuch" "--lmdb"
"--with-curses" "--notmuch"
"--with-gss" "--ssl"
"--sasl"
"--with-homespool=mailbox" "--with-homespool=mailbox"
"--with-idn"
"--with-lmdb"
"--with-mailpath=" "--with-mailpath="
"--with-sasl"
"--with-ssl"
# Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
"ac_cv_path_SENDMAIL=sendmail" "ac_cv_path_SENDMAIL=sendmail"
]; ];