Skip to content

Commit

Permalink
mailutils: fix build break
Browse files Browse the repository at this point in the history
See #14606 for the breakage. It is fixed by using default guile 2.0
Also addes support for fribidi, sasl, and gssapi
  • Loading branch information
vrthra committed Jul 4, 2016
1 parent 0da28e9 commit 27a9ef8
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 10 deletions.
19 changes: 10 additions & 9 deletions pkgs/tools/networking/mailutils/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ fetchurl, stdenv, gettext, gdbm, libtool, pam, readline
, ncurses, gnutls, mysql, guile, texinfo, gnum4, dejagnu, sendmailPath ? "/var/setuid-wrappers/sendmail" }:

/* TODO: Add GNU SASL, GNU GSSAPI, and FreeBidi. */
, ncurses, gnutls, sasl, fribidi, gss , mysql, guile, texinfo,
gnum4, dejagnu, nettools }:

stdenv.mkDerivation rec {
name = "mailutils-2.2";
Expand All @@ -11,17 +10,19 @@ stdenv.mkDerivation rec {
sha256 = "0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65";
};

patches = [ ./path-to-cat.patch ./no-gets.patch ];
patches = [ ./path-to-cat.patch ./no-gets.patch ./scm_c_string.patch ];

configureFlags = "--with-path-sendmail=${sendmailPath}";
configureFlags = [
"--with-gsasl"
"--with-gssapi=${gss}"
];

buildInputs =
[ gettext gdbm libtool pam readline ncurses
gnutls mysql.lib guile texinfo gnum4 ]
gnutls mysql.lib guile texinfo gnum4 sasl fribidi gss nettools ]
++ stdenv.lib.optional doCheck dejagnu;

# Tests fail since gcc 4.8
doCheck = false;
doCheck = true;

meta = with stdenv.lib; {
description = "Rich and powerful protocol-independent mail framework";
Expand Down Expand Up @@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
gpl3Plus /* tools */
];

maintainers = [ ];
maintainers = with maintainers; [ vrthra ];

homepage = http://www.gnu.org/software/mailutils/;

Expand Down
15 changes: 15 additions & 0 deletions pkgs/tools/networking/mailutils/scm_c_string.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
See https://lists.gnu.org/archive/html/bug-mailutils/2010-10/msg00005.html

diff -u mailutils-2.2/libmu_scm/mu_message.c mailutils-2.2.new/libmu_scm/mu_message.c
--- mailutils-2.2/libmu_scm/mu_message.c 2010-04-18 10:29:07.000000000 -0700
+++ mailutils-2.2.new/libmu_scm/mu_message.c 2016-07-03 21:18:53.746185547 -0700
@@ -510,8 +510,8 @@
{
SCM car = SCM_CAR (lst);
if (scm_is_string (car)
&& mu_c_strncasecmp (scm_i_string_chars (car), name,
- scm_i_string_length (car)) == 0)
+ scm_c_string_length (car)) == 0)
return 1;
}
return 0;
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2420,7 +2420,7 @@ in
mailpile = callPackage ../applications/networking/mailreaders/mailpile { };

mailutils = callPackage ../tools/networking/mailutils {
guile = guile_1_8;
sasl = gsasl;
};

email = callPackage ../tools/networking/email { };
Expand Down

0 comments on commit 27a9ef8

Please sign in to comment.