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/clucene-core | |
| 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/clucene-core')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix | 5 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/clucene-core/default.nix | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix index 52caa26c9c58..861e9179e094 100644 --- a/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix +++ b/nixpkgs/pkgs/development/libraries/clucene-core/2.x.nix @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_CL_HAVE_GCC_ATOMIC_FUNCTIONS=0" "-D_CL_HAVE_NAMESPACES_EXITCODE=0" + "-D_CL_HAVE_NAMESPACES_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE=0" - "-D_CL_HAVE_NO_SNWPRINTF_BUG_EXITCODE=0" + "-D_CL_HAVE_NO_SNPRINTF_BUG_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_TRY_BLOCKS_EXITCODE=0" + "-D_CL_HAVE_TRY_BLOCKS_EXITCODE__TRYRUN_OUTPUT=" "-D_CL_HAVE_PTHREAD_MUTEX_RECURSIVE=0" "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE=0" + "-DLUCENE_STATIC_CONSTANT_SYNTAX_EXITCODE__TRYRUN_OUTPUT=" ]; patches = # From debian diff --git a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix index 6f0eb8dfff00..58c24069a3a4 100644 --- a/nixpkgs/pkgs/development/libraries/clucene-core/default.nix +++ b/nixpkgs/pkgs/development/libraries/clucene-core/default.nix @@ -11,7 +11,12 @@ stdenv.mkDerivation rec { patches = [ ./gcc6.patch ]; + NIX_CFLAGS_COMPILE = [ + "-std=c++11" + ]; + meta = with lib; { + broken = stdenv.isDarwin; description = "Core library for full-featured text search engine"; longDescription = '' CLucene is a high-performance, scalable, cross platform, full-featured, |