diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-08-21 17:11:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 17:11:55 -0400 |
| commit | 91db1c8aec50fbb018e103140c85fdd6678faa03 (patch) | |
| tree | b6902e82d54187e3ba00dc437f93f414dd445a0b /pkgs/servers | |
| parent | 0447711c07e5a55400aaacc03b39e7a1eeaf8dd7 (diff) | |
| parent | f6a3403055e20774a9338f1a3c0b8cc5f27ee88d (diff) | |
| download | nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.gz nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.bz2 nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.lz nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.xz nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.tar.zst nixpkgs-91db1c8aec50fbb018e103140c85fdd6678faa03.zip | |
Merge pull request #87712 from aanderse/zabbix
zabbix: 4.4.8 -> 5.0.2
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/server.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/versions.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/web.nix | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index fdf3fd476df..9d0e1c199d3 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib +{ stdenv, fetchurl, autoreconfHook, pkgconfig, curl, libevent, libiconv, libxml2, openssl, pcre, zlib , jabberSupport ? true, iksemel , ldapSupport ? true, openldap , odbcSupport ? true, unixODBC @@ -25,7 +25,7 @@ in inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ curl libevent @@ -65,6 +65,13 @@ in find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} + ''; + preAutoreconf = '' + for i in $(find . -type f -name "*.m4"); do + substituteInPlace $i \ + --replace 'test -x "$PKG_CONFIG"' 'type -P "$PKG_CONFIG" >/dev/null' + done + ''; + postInstall = '' mkdir -p $out/share/zabbix/database/ cp -r include $out/ diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index c75df46cf04..f867c819d07 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { - v44 = generic { - version = "4.4.8"; - sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; + v50 = generic { + version = "5.0.2"; + sha256 = "1cnns7ixqi7ank3cbvcs7d8rb5zh9qiqbmgivazr83jnz81qg46w"; }; v40 = generic { diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index a75deff3db2..f677fe5c0af 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -18,7 +18,7 @@ import ./versions.nix ({ version, sha256 }: installPhase = '' mkdir -p $out/share/zabbix/ - cp -a frontends/php/. $out/share/zabbix/ + cp -a ${if stdenv.lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/ cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php ''; |