From 334b8af3c30f10cfc21b12ec0a5b1af3de18f02d Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sat, 30 May 2026 14:21:52 -0400
Subject: [PATCH] zabbix: pcre -> pcre2

---
 pkgs/servers/monitoring/zabbix/agent.nix  | 5 ++---
 pkgs/servers/monitoring/zabbix/agent2.nix | 5 ++---
 pkgs/servers/monitoring/zabbix/proxy.nix  | 5 ++---
 pkgs/servers/monitoring/zabbix/server.nix | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix
index 8266301b77c3..d96790f9841b 100644
--- a/pkgs/servers/monitoring/zabbix/agent.nix
+++ b/pkgs/servers/monitoring/zabbix/agent.nix
@@ -5,7 +5,6 @@
   pkg-config,
   libiconv,
   openssl,
-  pcre,
   pcre2,
 }:
 
@@ -26,14 +25,14 @@ import ./versions.nix (
     buildInputs = [
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
     ];
 
     configureFlags = [
       "--enable-agent"
       "--enable-ipv6"
       "--with-iconv"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-openssl=${openssl.dev}"
     ];
     makeFlags = [
diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix
index 1bd5bae89d3a..c6bd5ba7af18 100644
--- a/pkgs/servers/monitoring/zabbix/agent2.nix
+++ b/pkgs/servers/monitoring/zabbix/agent2.nix
@@ -6,7 +6,6 @@
   pkg-config,
   libiconv,
   openssl,
-  pcre,
   pcre2,
   zlib,
 }:
@@ -37,7 +36,7 @@ import ./versions.nix (
     buildInputs = [
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
       zlib
     ];
 
@@ -57,7 +56,7 @@ import ./versions.nix (
         --enable-agent2 \
         --enable-ipv6 \
         --with-iconv \
-        --with-libpcre \
+        --with-libpcre2 \
         --with-openssl=${openssl.dev}
     '';
 
diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix
index 688524e6f3ec..87fc5caa8591 100644
--- a/pkgs/servers/monitoring/zabbix/proxy.nix
+++ b/pkgs/servers/monitoring/zabbix/proxy.nix
@@ -7,7 +7,6 @@
   libevent,
   libiconv,
   openssl,
-  pcre,
   pcre2,
   zlib,
   buildPackages,
@@ -64,7 +63,7 @@ import ./versions.nix (
       libevent
       libiconv
       openssl
-      (if (lib.versions.major version >= "7" && lib.versions.minor version >= "4") then pcre2 else pcre)
+      pcre2
       zlib
     ]
     ++ optional odbcSupport unixodbc
@@ -80,7 +79,7 @@ import ./versions.nix (
       "--with-iconv"
       "--with-libcurl"
       "--with-libevent"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-openssl=${openssl.dev}"
       "--with-zlib=${zlib}"
     ]
diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix
index 9a01605a6238..901f79c00cb7 100644
--- a/pkgs/servers/monitoring/zabbix/server.nix
+++ b/pkgs/servers/monitoring/zabbix/server.nix
@@ -9,7 +9,6 @@
   libiconv,
   libxml2,
   openssl,
-  pcre,
   pcre2,
   zlib,
   jabberSupport ? true,
@@ -61,7 +60,7 @@ import ./versions.nix (
       libiconv
       libxml2
       openssl
-      (if lib.versionAtLeast version "7.4" then pcre2 else pcre)
+      pcre2
       zlib
     ]
     ++ optional odbcSupport unixodbc
@@ -79,7 +78,7 @@ import ./versions.nix (
       "--with-iconv"
       "--with-libcurl"
       "--with-libevent"
-      "--with-libpcre"
+      "--with-libpcre2"
       "--with-libxml2"
       "--with-openssl=${openssl.dev}"
       "--with-zlib=${zlib}"