cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

clucene-core: fix build on aarch64-darwin

Browse source
This commit is contained in:
Doro Rose 2023-11-28 10:23:18 +01:00
parent ac7c745539
commit fa2b3d0563
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/clucene-core/2.x.nix
View file

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, cmake, boost, zlib}:
{lib, stdenv, fetchurl, fetchpatch, cmake, boost, zlib}:
stdenv.mkDerivation rec {
pname = "clucene-core";
@ -40,8 +40,21 @@ stdenv.mkDerivation rec {
# required for darwin and linux-musl
./pthread-include.patch
] ++ lib.optionals stdenv.isDarwin [
./fix-darwin.patch
] ++ lib.optionals stdenv.isDarwin [ ./fix-darwin.patch ];
# see https://bugs.gentoo.org/869170
(fetchpatch {
url = "https://869170.bugs.gentoo.org/attachment.cgi?id=858825";
hash = "sha256-TbAfBKdXh+1HepZc8J6OhK1XGwhwBCMvO8QBDsad998=";
})
];
# see https://github.com/macports/macports-ports/commit/236d43f2450c6be52dc42fd3a2bbabbaa5136201
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace src/shared/CMakeLists.txt --replace 'fstati64;_fstati64;fstat64;fstat;_fstat' 'fstat;_fstat'
substituteInPlace src/shared/CMakeLists.txt --replace 'stati64;_stati64;stat64;stat;_stat' 'stat;_stat'
'';
# fails with "Unable to find executable:
# /build/clucene-core-2.3.3.4/build/bin/cl_test"

4
pkgs/top-level/all-packages.nix
View file

@ -20848,9 +20848,7 @@ with pkgs;
cln = callPackage ../development/libraries/cln { };
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
clucene_core_1 = callPackage ../development/libraries/clucene-core {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;