From 1182929a0b74720f772e2d8c6d84a7ccf59a881c Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 4 Jul 2013 11:16:02 +0200 Subject: [PATCH] zabbix20: Migrate XMPP support over to minmay. This should fix support for TLS and in addition, we now _only_ depend on one library rather than OpenSSL *and* GnuTLS as we no longer need iksemel. Signed-off-by: aszlig --- pkgs/servers/monitoring/zabbix/2.0.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index fef5010218c..90206f35853 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext -, enableJabber ? false, iksemel ? null }: +, enableJabber ? false, minmay ? null }: -assert enableJabber -> iksemel != null; +assert enableJabber -> minmay != null; let @@ -37,7 +37,15 @@ in "--with-postgresql" "--with-libcurl" "--with-gettext" - ] ++ stdenv.lib.optional enableJabber "--with-jabber=${iksemel}"; + ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}"; + + postPatch = '' + sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c + sed -i \ + -e '/^static ikstransport/,/}/d' \ + -e 's/iks_connect_with\(.*\), &zbx_iks_transport/mmay_connect_via\1/' \ + -e 's/iks/mmay/g' -e 's/IKS/MMAY/g' src/libs/zbxmedia/jabber.c + ''; buildInputs = [ pkgconfig postgresql curl openssl zlib ];