diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index a5f5849284c..aec12d393a4 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,12 +1,25 @@ -args: with args; +{stdenv, fetchurl, openssl, cyrus_sasl, db4, groff}: stdenv.mkDerivation { - name = "openldap-2.3.32"; + name = "openldap-2.4.13"; + src = fetchurl { - url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.3.32.tgz; - sha256 = "1pw6j8ag8nm91mccwb3p9wk7ccsfdb8jz5v6a5alfrq3npyck0j8"; + url = ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/openldap-2.4.13.tgz; + sha256 = "18l06v8z5wnr92m28bwxd27l6kw3i0gi00yivv603da6m76cm0ic"; }; - buildInputs = [openssl cyrus_sasl db4]; + + buildInputs = [openssl cyrus_sasl db4 groff]; + configureFlags = "--disable-static"; + 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"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1c9348e2b1..d68f5103317 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3631,19 +3631,19 @@ let openexr_1_6_1 = import ../development/libraries/openexr { inherit fetchurl stdenv ilmbase zlib pkgconfig lib; - version = "1.6.1"; - # optional features: - inherit ctl; + version = "1.6.1"; + # optional features: + inherit ctl; }; # This older version is needed by blender (it complains about missing half.h ) openexr_1_4_0 = import ../development/libraries/openexr { inherit fetchurl stdenv ilmbase zlib pkgconfig lib; - version = "1.4.0"; + version = "1.4.0"; }; 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 {