From 8511f045b723b27e0a3549d815002cd114669400 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 6 Nov 2018 20:00:26 -0600 Subject: [PATCH] clucene-core: fix install name --- pkgs/development/libraries/clucene-core/2.x.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index a14dec37047..004c01a5b69 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { buildInputs = [ boost zlib ]; - cmakeFlags = [ "-DBUILD_CONTRIBS=ON" "-DBUILD_CONTRIBS_LIB=ON" ]; + cmakeFlags = [ + "-DBUILD_CONTRIBS=ON" + "-DBUILD_CONTRIBS_LIB=ON" + "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + ]; patches = # From debian [ ./Fix-pkgconfig-file-by-adding-clucene-shared-library.patch @@ -20,13 +24,9 @@ stdenv.mkDerivation rec { ./Install-contribs-lib.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -change libclucene-shared.1.dylib \ - $out/lib/libclucene-shared.1.dylib \ - $out/lib/libclucene-core.1.dylib - ''; - - doCheck = false; # fails with "Unable to find executable: /build/clucene-core-2.3.3.4/build/bin/cl_test" + # fails with "Unable to find executable: + # /build/clucene-core-2.3.3.4/build/bin/cl_test" + doCheck = false; meta = with stdenv.lib; { description = "Core library for full-featured text search engine";