diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
| commit | c4661e96434118637a5c41511a6c7f015726396f (patch) | |
| tree | edd7a4026fd903cddfb32b27f629af7f5c110fa8 /pkgs/servers/monitoring | |
| parent | bfd522da633bd904918a939b29f0a0ebb594fa6b (diff) | |
| parent | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (diff) | |
| download | nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.gz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.bz2 nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.lz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.xz nixlib-c4661e96434118637a5c41511a6c7f015726396f.tar.zst nixlib-c4661e96434118637a5c41511a6c7f015726396f.zip | |
Merge: make dev output references explicit
This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/net-snmp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/2.2.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 816ac1bdb25e..6da7d8cf85b8 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--with-sys-contact=root@unknown" "--with-logfile=/var/log/net-snmpd.log" "--with-persistent-directory=/var/lib/net-snmp" - "--with-openssl=${openssl}" + "--with-openssl=${openssl.dev}" ] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts"; buildInputs = [ autoreconfHook file perl unzip openssl ]; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 139786ba59d0..2ebc8026484c 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -46,8 +46,8 @@ in ] ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" ++ stdenv.lib.optional enableSnmp "--with-net-snmp" - ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2}" - ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; + ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}" + ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap.dev}"; postPatch = '' sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c |