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

mailutils: fix build with mariadb 10.2

Browse source
This commit is contained in:
Robin Gloster 2017-10-09 10:04:51 +02:00
parent 3881816a64
commit 64178f1cab
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/tools/networking/mailutils/default.nix
View file

@ -1,11 +1,10 @@
{ stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, libtool, pkgconfig { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig
, gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools
, gss, mysql }: , python, gss, mysql }:
let let
p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files"; p = "https://raw.githubusercontent.com/gentoo/gentoo/9c921e89d51876fd876f250324893fd90c019326/net-mail/mailutils/files";
in in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {
name = "${project}-${version}"; name = "${project}-${version}";
project = "mailutils"; project = "mailutils";
version = "3.2"; version = "3.2";
@ -16,11 +15,11 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook gettext libtool pkgconfig autoreconfHook gettext pkgconfig
] ++ stdenv.lib.optional doCheck dejagnu; ] ++ stdenv.lib.optional doCheck dejagnu;
buildInputs = [ buildInputs = [
gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools
gss mysql.connector-c gss mysql.connector-c python
]; ];
patches = [ patches = [
@ -52,14 +51,20 @@ stdenv.mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
sed -e '/AM_GNU_GETTEXT_VERSION/s/0.18/0.19/' -i configure.ac
sed -i -e '/chown root:mail/d' \ sed -i -e '/chown root:mail/d' \
-e 's/chmod [24]755/chmod 0755/' \ -e 's/chmod [24]755/chmod 0755/' \
*/Makefile{.in,.am} */Makefile{.in,.am}
sed -i 's:/usr/lib/mysql:${mysql.connector-c}/lib/mariadb:' configure.ac
sed -i 's/0\.18/0.19/' configure.ac
sed -i -e 's:mysql/mysql.h:mysql.h:' \
-e 's:mysql/errmsg.h:errmsg.h:' \
sql/mysql.c
''; '';
NIX_CFLAGS_COMPILE = "-L${mysql.connector-c}/lib/mariadb -I${mysql.connector-c}/include/mariadb";
preCheck = '' preCheck = ''
# Add missing files. # Add missing test files
cp ${builtins.toString readmsg-tests} readmsg/tests/ cp ${builtins.toString readmsg-tests} readmsg/tests/
for f in hdr.at nohdr.at twomsg.at weed.at; do for f in hdr.at nohdr.at twomsg.at weed.at; do
mv readmsg/tests/*-$f readmsg/tests/$f mv readmsg/tests/*-$f readmsg/tests/$f