From 63ab4ebf8d07e586b3317fc6d47aeae3a27a8d9a Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Tue, 30 Aug 2016 23:29:10 +0200 Subject: openldap: do strip, with proper fix [dezgeg: Add comment about the proper fix in patchelf] --- pkgs/development/libraries/openldap/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pkgs/development/libraries/openldap') diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 23342d326fe..70089a74625 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; { -- cgit 1.4.1