mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-25 04:12:44 +03:00
treewide: Make explicit that 'dev' output of openldap is used
This commit is contained in:
parent
99acb412ab
commit
5eb01cd0ad
@ -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"
|
||||
|
@ -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"
|
||||
];
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user