BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #186646 from RaitoBezarius/neomutt-optional-features

Browse source 
neomutt: enable zstd by default, offer mixmaster support
This commit is contained in:
Guillaume Girol 2022-09-03 18:20:05 +00:00 committed by GitHub
commit 739ef5eb43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/applications/networking/mailreaders/neomutt/default.nix
View file

@ -1,6 +1,7 @@
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
, ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn, libxml2, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
, zstd, enableZstd ? true, enableMixmaster ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +19,8 @@ stdenv.mkDerivation rec {
cyrus_sasl gss gpgme libkrb5 libidn ncurses cyrus_sasl gss gpgme libkrb5 libidn ncurses
notmuch openssl perl lmdb notmuch openssl perl lmdb
mailcap sqlite mailcap sqlite
]; ]
++ lib.optional enableZstd zstd;
nativeBuildInputs = [ nativeBuildInputs = [
docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m docbook_xsl docbook_xml_dtd_42 gettext libxml2 libxslt.bin makeWrapper tcl which zlib w3m
@ -62,7 +64,9 @@ stdenv.mkDerivation rec {
# https://github.com/neomutt/neomutt/pull/2367 # https://github.com/neomutt/neomutt/pull/2367
"--disable-include-path-in-cflags" "--disable-include-path-in-cflags"
"--zlib" "--zlib"
]; ]
++ lib.optional enableZstd "--zstd"
++ lib.optional enableMixmaster "--mixmaster";
# Fix missing libidn in mutt; # Fix missing libidn in mutt;
# this fix is ugly since it links all binaries in mutt against libidn # this fix is ugly since it links all binaries in mutt against libidn
@ -95,7 +99,7 @@ stdenv.mkDerivation rec {
description = "A small but very powerful text-based mail client"; description = "A small but very powerful text-based mail client";
homepage = "http://www.neomutt.org"; homepage = "http://www.neomutt.org";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ]; maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }