From 40bde30d2a1a9fd3635b6c53cbf18a22d3b290af Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 8 Feb 2022 14:03:34 +0100 Subject: [PATCH] mailutils: 3.13 -> 3.14 and use `mailcap` to provide mime.types --- pkgs/tools/networking/mailutils/default.nix | 53 +++++++++++++++++---- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 3b939021b300..532c8c14ab5b 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,14 +1,36 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkg-config -, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python3, gss, libmysqlclient, system-sendmail }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, dejagnu +, gettext +, gnum4 +, pkg-config +, texinfo +, fribidi +, gdbm +, gnutls +, gss +, guile +, libmysqlclient +, mailcap +, nettools +, pam +, readline +, ncurses +, python3 +, sasl +, system-sendmail +}: stdenv.mkDerivation rec { pname = "mailutils"; - version = "3.13"; + version = "3.14"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-2SCXHctJh4oAmRF3T9ZATxPSe9EB4tWbZkooZZpAlMc="; + hash = "sha256-wMWzj+qLRaSvzUNkh/Knb9VSUJLQN4gTputVQsIScTk="; }; postPatch = '' @@ -19,12 +41,26 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - autoreconfHook gettext pkg-config + autoreconfHook + gettext + gnum4 + pkg-config + texinfo ]; buildInputs = [ - gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi - gss libmysqlclient python3 + fribidi + gdbm + gnutls + gss + guile + libmysqlclient + mailcap + ncurses + pam + python3 + readline + sasl ] ++ lib.optionals stdenv.isLinux [ nettools ]; patches = [ @@ -47,6 +83,7 @@ stdenv.mkDerivation rec { "--with-mysql" "--with-path-sendmail=${system-sendmail}/bin/sendmail" "--with-mail-rc=/etc/mail.rc" + "DEFAULT_CUPS_CONFDIR=${mailcap}/etc" # provides mime.types to mimeview ]; readmsg-tests = let