diff options
author | Guillaume Maudoux <layus.on@gmail.com> | 2016-08-30 23:29:10 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-08-31 23:08:32 +0300 |
commit | 63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a (patch) | |
tree | 4e72143c98dde0458f80d503684f9beb36d9dc57 | |
parent | 204f19ede1b72dbfa09aff692d64df1429e23243 (diff) | |
download | nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.tar nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.tar.gz nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.tar.bz2 nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.tar.lz nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.tar.xz nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.tar.zst nixlib-63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a.zip |
openldap: do strip, with proper fix
[dezgeg: Add comment about the proper fix in patchelf]
-rw-r--r-- | pkgs/development/libraries/openldap/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 23342d326fea..70089a746257 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -20,13 +20,16 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl" ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic"; - dontPatchELF = 1; # !!! - - # Fixup broken libtool + # 1. Fixup broken libtool + # 2. Libraries left in the build location confuse `patchelf --shrink-rpath` + # Delete these to let patchelf discover the right path instead. + # FIXME: that one can be removed when https://github.com/NixOS/patchelf/pull/98 + # is in Nixpkgs patchelf. preFixup = '' sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \ -e 's,-lssl,-L${openssl.out}/lib -lssl,' \ -i $out/lib/libldap.la -i $out/lib/libldap_r.la + rm -r libraries/*/.libs ''; meta = with stdenv.lib; { |