* OpenLDAP updated to 2.4.13. Also a workaround for a header problem.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14050
This commit is contained in:
parent
1408710472
commit
6f29bd14bc
@ -1,12 +1,25 @@
|
|||||||
args: with args;
|
{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "openldap-2.3.32";
|
name = "openldap-2.4.13";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.3.32.tgz;
|
url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.4.13.tgz;
|
||||||
sha256 = "1pw6j8ag8nm91mccwb3p9wk7ccsfdb8jz5v6a5alfrq3npyck0j8";
|
sha256 = "18l06v8z5wnr92m28bwxd27l6kw3i0gi00yivv603da6m76cm0ic";
|
||||||
};
|
};
|
||||||
buildInputs = [openssl cyrus_sasl db4];
|
|
||||||
|
buildInputs = [openssl cyrus_sasl db4 groff];
|
||||||
|
|
||||||
configureFlags = "--disable-static";
|
configureFlags = "--disable-static";
|
||||||
|
|
||||||
dontPatchELF = 1; # !!!
|
dontPatchELF = 1; # !!!
|
||||||
|
|
||||||
|
# Build on Glibc 2.9.
|
||||||
|
# http://www.openldap.org/lists/openldap-bugs/200808/msg00130.html
|
||||||
|
NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
|
||||||
|
|
||||||
|
meta = {
|
||||||
|
homepage = http://www.openldap.org/;
|
||||||
|
description = "An open source implementation of the Lightweight Directory Access Protocol";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
@ -3631,19 +3631,19 @@ let
|
|||||||
|
|
||||||
openexr_1_6_1 = import ../development/libraries/openexr {
|
openexr_1_6_1 = import ../development/libraries/openexr {
|
||||||
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
|
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
|
||||||
version = "1.6.1";
|
version = "1.6.1";
|
||||||
# optional features:
|
# optional features:
|
||||||
inherit ctl;
|
inherit ctl;
|
||||||
};
|
};
|
||||||
|
|
||||||
# This older version is needed by blender (it complains about missing half.h )
|
# This older version is needed by blender (it complains about missing half.h )
|
||||||
openexr_1_4_0 = import ../development/libraries/openexr {
|
openexr_1_4_0 = import ../development/libraries/openexr {
|
||||||
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
|
inherit fetchurl stdenv ilmbase zlib pkgconfig lib;
|
||||||
version = "1.4.0";
|
version = "1.4.0";
|
||||||
};
|
};
|
||||||
|
|
||||||
openldap = import ../development/libraries/openldap {
|
openldap = import ../development/libraries/openldap {
|
||||||
inherit fetchurl stdenv openssl cyrus_sasl db4;
|
inherit fetchurl stdenv openssl cyrus_sasl db4 groff;
|
||||||
};
|
};
|
||||||
|
|
||||||
openssl = import ../development/libraries/openssl {
|
openssl = import ../development/libraries/openssl {
|
||||||
|
Loading…
Reference in New Issue
Block a user