From 92ce529880c5d7622f6469ac1395f120fcb749d4 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 25 May 2016 16:31:23 +0000 Subject: [PATCH] Revert "openldap: Remove dontPatchELF" This reverts commit 366c1e88fc811e1ceb03e897d883b7bd765e7627, that caused OpenLDAP to not find its own libs. See discussion in https://github.com/NixOS/nixpkgs/commit/366c1e88fc811e1ceb03e897d883b7bd765e7627 --- pkgs/development/libraries/openldap/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index cc5a26a557d5..00b4139dc7cb 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; + dontPatchELF = 1; # !!! + # Fixup broken libtool preFixup = '' sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \