diff options
| author | janus <janus@xn--kn-1ia.guru> | 2015-11-28 00:46:00 +0000 |
|---|---|---|
| committer | janus <janus@xn--kn-1ia.guru> | 2016-01-01 17:01:13 +0000 |
| commit | a472d836f674fe388018aaee75983e3400a77db4 (patch) | |
| tree | 5ee0c10f33ad74f04d5d3785de81fbb04b4e57f2 /pkgs/development/libraries/openldap/default.nix | |
| parent | 9897b356612c4bb06a9c9d688da52134dfe8fb95 (diff) | |
| download | nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.gz nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.bz2 nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.lz nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.xz nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.zst nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.zip | |
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
Diffstat (limited to 'pkgs/development/libraries/openldap/default.nix')
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 253f74ecc6a..7d836cd5a0d 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -9,7 +9,16 @@ stdenv.mkDerivation rec { }; # Should be removed with >=2.4.43 - patches = [ ./CVE-2015-6908.patch ]; + patches = [ + ./CVE-2015-6908.patch + ( + fetchurl { + sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3"; + url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch"; + name = "openldap-clang-compilation.patch"; + } + ) + ]; outputs = [ "out" "man" ]; @@ -19,7 +28,8 @@ stdenv.mkDerivation rec { [ "--enable-overlays" "--disable-dependency-tracking" # speeds up one-time build ] ++ stdenv.lib.optional (openssl == null) "--without-tls" - ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"; + ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" + ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; dontPatchELF = 1; # !!! |