From 2867b465b57a40ab34e146519828e53eb698687e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 15 Jul 2025 14:11:04 +0200 Subject: [PATCH] zabbix: fix build for zabbix74 add conditional for pcre2 starting at version 7.4 Signed-off-by: Florian Brandes --- pkgs/servers/monitoring/zabbix/agent.nix | 3 ++- pkgs/servers/monitoring/zabbix/agent2.nix | 3 ++- pkgs/servers/monitoring/zabbix/proxy.nix | 3 ++- pkgs/servers/monitoring/zabbix/server.nix | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index ae6e5618167d..aeae46821891 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,6 +6,7 @@ libiconv, openssl, pcre, + pcre2, }: import ./versions.nix ( @@ -23,7 +24,7 @@ import ./versions.nix ( buildInputs = [ libiconv openssl - pcre + (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) ]; configureFlags = [ diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index e4e009cc64a7..1bd5bae89d3a 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -7,6 +7,7 @@ libiconv, openssl, pcre, + pcre2, zlib, }: @@ -36,7 +37,7 @@ import ./versions.nix ( buildInputs = [ libiconv openssl - pcre + (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) zlib ]; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 65cc2c024e1a..cd66c2997046 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -8,6 +8,7 @@ libiconv, openssl, pcre, + pcre2, zlib, buildPackages, odbcSupport ? true, @@ -61,7 +62,7 @@ import ./versions.nix ( libevent libiconv openssl - pcre + (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) zlib ] ++ optional odbcSupport unixODBC diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 54968b0bd4ff..a45d0a52eda9 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -10,6 +10,7 @@ libxml2, openssl, pcre, + pcre2, zlib, jabberSupport ? true, iksemel, @@ -58,7 +59,7 @@ import ./versions.nix ( libiconv libxml2 openssl - pcre + (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre) zlib ] ++ optional odbcSupport unixODBC