diff options
| author | Rickard Nilsson <rickynils@gmail.com> | 2016-05-25 16:31:23 +0000 |
|---|---|---|
| committer | Rickard Nilsson <rickynils@gmail.com> | 2016-05-25 16:31:23 +0000 |
| commit | 92ce529880c5d7622f6469ac1395f120fcb749d4 (patch) | |
| tree | fb574c185ca7d23fb2725ce597ab3efc87a9044c /pkgs/development/libraries/openldap | |
| parent | a7baec7cb1539bd82bd458c64994bf476cdfe273 (diff) | |
| download | nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.tar nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.tar.gz nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.tar.bz2 nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.tar.lz nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.tar.xz nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.tar.zst nixlib-92ce529880c5d7622f6469ac1395f120fcb749d4.zip | |
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
Diffstat (limited to 'pkgs/development/libraries/openldap')
| -rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
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,' \ |