diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/lucene++/default.nix | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/lucene++/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/lucene++/default.nix | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/nixpkgs/pkgs/development/libraries/lucene++/default.nix index ef55541ed777..08a348505006 100644 --- a/nixpkgs/pkgs/development/libraries/lucene++/default.nix +++ b/nixpkgs/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gtest, zlib }: stdenv.mkDerivation rec { pname = "lucene++"; @@ -14,13 +14,23 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost gtest zlib ]; - doCheck = true; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + patches = [ + (fetchpatch { + name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; + sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; + }) + ]; postPatch = '' - substituteInPlace src/test/CMakeLists.txt \ - --replace "add_subdirectory(gtest)" "" + substituteInPlace src/test/CMakeLists.txt \ + --replace "add_subdirectory(gtest)" "" ''; + doCheck = true; + checkPhase = '' runHook preCheck LD_LIBRARY_PATH=$PWD/src/contrib:$PWD/src/core \ @@ -30,6 +40,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/include/pkgconfig $out/lib/ + cp $src/src/contrib/include/*h $out/include/lucene++/ ''; meta = { |