diff options
author | Peter Hoeg <peter@hoeg.com> | 2017-10-27 15:02:54 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-27 15:02:54 +0800 |
commit | 2542944a95a41c31caaeb6b0765afa1e293d40ac (patch) | |
tree | 61d055cb536de976bcfb3126eb6c95aa32aac685 | |
parent | 8f17abf29c769e6914ed585e7e56601c58877e2d (diff) | |
parent | 2ef36f2ee58d3566374b09724d93ac8114796921 (diff) | |
download | nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.tar nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.tar.gz nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.tar.bz2 nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.tar.lz nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.tar.xz nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.tar.zst nixlib-2542944a95a41c31caaeb6b0765afa1e293d40ac.zip |
Merge pull request #30401 from peterhoeg/u/mutt
neomutt: minor cleanups and introduce wrapper for users invoking `mutt`
-rw-r--r-- | pkgs/applications/networking/mailreaders/neomutt/default.nix | 45 |
1 files changed, 34 insertions, 11 deletions
diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index a6cd17878b0c..d9d2f201fdc1 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,7 +1,19 @@ -{ stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl +{ stdenv, fetchFromGitHub, which, autoreconfHook, writeScript, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }: -stdenv.mkDerivation rec { +let + muttWrapper = writeScript "mutt" '' + #!${stdenv.shell} -eu + + echo 'The neomutt project has renamed the main binary from `mutt` to `neomutt`.' + echo "" + echo 'This wrapper is provided for compatibility purposes only. You should start calling `neomutt` instead.' + echo "" + read -p 'Press any key to launch NeoMutt...' -n1 -s + exec neomutt "$@" + ''; + +in stdenv.mkDerivation rec { version = "20171013"; name = "neomutt-${version}"; @@ -12,24 +24,35 @@ stdenv.mkDerivation rec { sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; + + enableParallelBuilding = true; + + postPatch = '' + for f in doc/*.{xml,xsl}* ; do + substituteInPlace $f \ + --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl \ + --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd + done + ''; + configureFlags = [ "--enable-debug" "--enable-gpgme" "--enable-notmuch" - "--with-homespool=mailbox" - "--with-gss" - "--with-mailpath=" - "--with-ssl" - "--with-sasl" "--with-curses" + "--with-gss" + "--with-homespool=mailbox" "--with-idn" "--with-lmdb" + "--with-mailpath=" + "--with-sasl" + "--with-ssl" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" @@ -40,9 +63,9 @@ stdenv.mkDerivation rec { # like pgpring, pgpewrap, ... NIX_LDFLAGS = "-lidn"; - configureScript = "./prepare"; - - enableParallelBuilding = true; + postInstall = '' + cp ${muttWrapper} $out/bin/mutt + ''; meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; |