zabbix: fix build for zabbix74 (#425409)

This commit is contained in:
Florian 2025-07-16 11:25:53 +02:00 committed by GitHub
commit da6da6de14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 4 deletions

View File

@ -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 = [

View File

@ -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
];

View File

@ -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

View File

@ -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