pyrox.dev
Cross fixes (#374611)
+2
-1
pkgs/by-name/ab/abuild/package.nix
+2
-1
pkgs/by-name/ab/abuild/package.nix
+20
-2
pkgs/servers/monitoring/zabbix/proxy.nix
+20
-2
pkgs/servers/monitoring/zabbix/proxy.nix
···
8
8
openssl,
9
9
pcre,
10
10
zlib,
11
+
buildPackages,
11
12
odbcSupport ? true,
12
13
unixODBC,
13
14
snmpSupport ? stdenv.buildPlatform == stdenv.hostPlatform,
···
29
30
30
31
let
31
32
inherit (lib) optional optionalString;
33
+
34
+
fake_pg_config = buildPackages.writeShellScript "pg_config" ''
35
+
if [[ "$1" == "--version" ]]; then
36
+
$PKG_CONFIG libpq --modversion
37
+
else
38
+
$PKG_CONFIG libpq --variable="''${1//--/}"
39
+
fi
40
+
'';
41
+
42
+
fake_mysql_config = buildPackages.writeShellScript "mysql_config" ''
43
+
if [[ "$1" == "--version" ]]; then
44
+
$PKG_CONFIG mysqlclient --modversion
45
+
else
46
+
$PKG_CONFIG mysqlclient $@
47
+
fi
48
+
'';
49
+
32
50
in
33
51
import ./versions.nix (
34
52
{ version, hash, ... }:
···
71
89
++ optional snmpSupport "--with-net-snmp"
72
90
++ optional sqliteSupport "--with-sqlite3=${sqlite.dev}"
73
91
++ optional sshSupport "--with-ssh2=${libssh2.dev}"
74
-
++ optional mysqlSupport "--with-mysql"
75
-
++ optional postgresqlSupport "--with-postgresql";
92
+
++ optional mysqlSupport "--with-mysql=${fake_mysql_config}"
93
+
++ optional postgresqlSupport "--with-postgresql=${fake_pg_config}";
76
94
77
95
prePatch = ''
78
96
find database -name data.sql -exec sed -i 's|/usr/bin/||g' {} +