From 5c8bd5c69460b7b9c3174a6e907cfb5cfeabdc2f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 6 Jan 2022 17:28:37 +0800 Subject: [PATCH 1/2] abuild: set proper pkg-config name --- pkgs/by-name/ab/abuild/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix index a6ad5b1f90bb..33d2495bbcab 100644 --- a/pkgs/by-name/ab/abuild/package.nix +++ b/pkgs/by-name/ab/abuild/package.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation (finalAttrs: { patchPhase = '' substituteInPlace ./Makefile \ - --replace 'chmod 4555' '#chmod 4555' + --replace 'chmod 4555' '#chmod 4555' \ + --replace 'pkg-config' "$PKG_CONFIG" ''; makeFlags = [ From f1b5c37655f3d1f73dc4d18e790cba2f950afd2d Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 17 Jan 2025 20:50:36 +0200 Subject: [PATCH 2/2] zabbix.proxy-{pgsql,mysql}: Fix cross --- pkgs/servers/monitoring/zabbix/proxy.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index c0ac7d46628b..7d4efa70c1a0 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -8,6 +8,7 @@ openssl, pcre, zlib, + buildPackages, odbcSupport ? true, unixODBC, snmpSupport ? stdenv.buildPlatform == stdenv.hostPlatform, @@ -29,6 +30,23 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let inherit (lib) optional optionalString; + + fake_pg_config = buildPackages.writeShellScript "pg_config" '' + if [[ "$1" == "--version" ]]; then + $PKG_CONFIG libpq --modversion + else + $PKG_CONFIG libpq --variable="''${1//--/}" + fi + ''; + + fake_mysql_config = buildPackages.writeShellScript "mysql_config" '' + if [[ "$1" == "--version" ]]; then + $PKG_CONFIG mysqlclient --modversion + else + $PKG_CONFIG mysqlclient $@ + fi + ''; + in import ./versions.nix ( { version, hash, ... }: @@ -71,8 +89,8 @@ import ./versions.nix ( ++ optional snmpSupport "--with-net-snmp" ++ optional sqliteSupport "--with-sqlite3=${sqlite.dev}" ++ optional sshSupport "--with-ssh2=${libssh2.dev}" - ++ optional mysqlSupport "--with-mysql" - ++ optional postgresqlSupport "--with-postgresql"; + ++ optional mysqlSupport "--with-mysql=${fake_mysql_config}" + ++ optional postgresqlSupport "--with-postgresql=${fake_pg_config}"; prePatch = '' find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +