diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:39:09 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:45 +0200 |
| commit | d7071caba5e0b3ae010c1cee74997c4acb851998 (patch) | |
| tree | 822553e48a5b1757a0d49d9079b7f3a8fcf42bef | |
| parent | 8638a08c9ec43d251a967fc574490c8d8cf1eb53 (diff) | |
| download | nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.tar nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.tar.gz nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.tar.bz2 nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.tar.lz nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.tar.xz nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.tar.zst nixlib-d7071caba5e0b3ae010c1cee74997c4acb851998.zip | |
treewide: Make explicit that 'dev' output of libssh2 is used
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/2.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/7.15.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 139786ba59d0..ca62c5cddfa8 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -46,7 +46,7 @@ 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 enableSsh "--with-ssh2=${libssh2.dev}" ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; postPatch = '' diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 56046d5423dd..06106c62b4ea 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) + ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index ec4c1f793080..d313b9b4dc34 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" "--disable-manual" ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) + ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) ( if ldapSupport then "--enable-ldap" else "--disable-ldap" ) ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" ) ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" ) |