diff options
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/2.0.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 5131e8a2e42e..fef5010218cc 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext }: +{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, gettext +, enableJabber ? false, iksemel ? null }: + +assert enableJabber -> iksemel != null; let @@ -21,13 +24,20 @@ let in { + recurseForDerivations = true; server = stdenv.mkDerivation { name = "zabbix-${version}"; inherit src preConfigure; - configureFlags = "--enable-agent --enable-server --with-postgresql --with-libcurl --with-gettext"; + configureFlags = [ + "--enable-agent" + "--enable-server" + "--with-postgresql" + "--with-libcurl" + "--with-gettext" + ] ++ stdenv.lib.optional enableJabber "--with-jabber=${iksemel}"; buildInputs = [ pkgconfig postgresql curl openssl zlib ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18577679c3af..288cee3de994 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5912,9 +5912,7 @@ let inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib; }); - zabbix20 = recurseIntoAttrs (import ../servers/monitoring/zabbix/2.0.nix { - inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib gettext; - }); + zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; ### OS-SPECIFIC |