Unverified Commit 2867b465 authored by Florian Brandes's avatar Florian Brandes
Browse files

zabbix: fix build for zabbix74 



add conditional for pcre2 starting at version 7.4

Signed-off-by: default avatarFlorian Brandes <florian.brandes@posteo.de>
parent c1bdb17d

pkgs/servers/monitoring/zabbix/agent.nix

+2 −1
Original line number Diff line number Diff line
@@ -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 = [

pkgs/servers/monitoring/zabbix/agent2.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

    ];

pkgs/servers/monitoring/zabbix/proxy.nix

+2 −1
Original line number Diff line number Diff line
@@ -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

pkgs/servers/monitoring/zabbix/server.nix

+2 −1
Original line number Diff line number Diff line
@@ -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