diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:41:33 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:50 +0200 |
commit | 5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9 (patch) | |
tree | 082fbe046b39083d2af641a3f2443f28526fc9ed /pkgs | |
parent | 99acb412ab50bb7aaf6060b698e9b9751f13fef6 (diff) | |
download | nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.tar nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.tar.gz nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.tar.bz2 nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.tar.lz nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.tar.xz nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.tar.zst nixlib-5eb01cd0adc3d5dfe1e81abac288d9764ef7e4d9.zip |
treewide: Make explicit that 'dev' output of openldap is used
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/ekiga/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/kerberos/heimdal.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/2.2.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 0823cb1eef77..9c7204b7fa10 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-ldap-dir=${openldap}" + "--with-ldap-dir=${openldap.dev}" "--with-libsasl2-dir=${cyrus_sasl.dev}" "--with-boost-libdir=${boost.out}/lib" "--disable-gconf" diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 175d0c7bc3b2..27315fa4ccb2 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "--without-x" "--with-berkeley-db=${db}" ] ++ optionals (!libOnly) [ - "--with-openldap=${openldap}" + "--with-openldap=${openldap.dev}" ] ++ optionals (!stdenv.isFreeBSD) [ "--with-capng" ]; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index ca62c5cddfa8..2ebc8026484c 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -47,7 +47,7 @@ in ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" ++ stdenv.lib.optional enableSnmp "--with-net-snmp" ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}" - ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; + ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap.dev}"; postPatch = '' sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c |