public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of openldap is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:41:33 +03:00 committed by Vladimír Čunát
parent 99acb412ab
commit 5eb01cd0ad
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--with-ldap-dir=${openldap}" "--with-ldap-dir=${openldap.dev}"
"--with-libsasl2-dir=${cyrus_sasl.dev}" "--with-libsasl2-dir=${cyrus_sasl.dev}"
"--with-boost-libdir=${boost.out}/lib" "--with-boost-libdir=${boost.out}/lib"
"--disable-gconf" "--disable-gconf"

2
pkgs/development/libraries/kerberos/heimdal.nix
View File

@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
"--without-x" "--without-x"
"--with-berkeley-db=${db}" "--with-berkeley-db=${db}"
] ++ optionals (!libOnly) [ ] ++ optionals (!libOnly) [
"--with-openldap=${openldap}" "--with-openldap=${openldap.dev}"
] ++ optionals (!stdenv.isFreeBSD) [ ] ++ optionals (!stdenv.isFreeBSD) [
"--with-capng" "--with-capng"
]; ];

2
pkgs/servers/monitoring/zabbix/2.2.nix
View File

@ -47,7 +47,7 @@ in
++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}" ++ stdenv.lib.optional enableJabber "--with-jabber=${minmay}"
++ stdenv.lib.optional enableSnmp "--with-net-snmp" ++ stdenv.lib.optional enableSnmp "--with-net-snmp"
++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}" ++ stdenv.lib.optional enableSsh "--with-ssh2=${libssh2.dev}"
++ stdenv.lib.optional enableLdap "--with-ldap=${openldap}"; ++ stdenv.lib.optional enableLdap "--with-ldap=${openldap.dev}";
postPatch = '' postPatch = ''
sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c sed -i -e 's/iksemel/minmay/g' configure src/libs/zbxmedia/jabber.c