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 <aszlig@redmoonstudios.org>
This commit is contained in:
parent
1a9e99a8e4
commit
1182929a0b
@ -1,7 +1,7 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext
|
{ 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
|
let
|
||||||
|
|
||||||
@ -37,7 +37,15 @@ in
|
|||||||
"--with-postgresql"
|
"--with-postgresql"
|
||||||
"--with-libcurl"
|
"--with-libcurl"
|
||||||
"--with-gettext"
|
"--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 ];
|
buildInputs = [ pkgconfig postgresql curl openssl zlib ];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user