From 385c252b3aa291f2689047ae364f8158eeb030a3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 27 Dec 2022 13:26:54 +0100 Subject: jumanpp: unbreak on aarch64-darwin --- pkgs/tools/text/jumanpp/default.nix | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/text/jumanpp') diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 5c6943b281df7..348c785ab28dd 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, cmake, protobuf, libiconv }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, protobuf, libiconv }: stdenv.mkDerivation rec { pname = "jumanpp"; @@ -9,7 +9,25 @@ stdenv.mkDerivation rec { sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ="; }; - patches = [ ./0001-Exclude-all-tests-from-the-build.patch ]; + patches = [ + ./0001-Exclude-all-tests-from-the-build.patch + # https://github.com/ku-nlp/jumanpp/pull/132 + (fetchpatch { + name = "fix-unused-warning.patch"; + url = "https://github.com/ku-nlp/jumanpp/commit/cc0d555287c8b214e9d6f0279c449a4e035deee4.patch"; + sha256 = "sha256-yRKwuUJ2UPXJcjxBGhSOmcQI/EOijiJDMmmmSRdNpX8="; + }) + (fetchpatch { + name = "update-libs.patch"; + url = "https://github.com/ku-nlp/jumanpp/commit/5e9068f56ae310ed7c1df185b14d49654ffe1ab6.patch"; + sha256 = "sha256-X49/ZoLT0OGePLZYlgacNxA1dHM4WYdQ8I4LW3sW16E="; + }) + (fetchpatch { + name = "fix-mmap-on-apple-m1.patch"; + url = "https://github.com/ku-nlp/jumanpp/commit/0c22249f12928d0c962f03f229026661bf0c7921.patch"; + sha256 = "sha256-g6CuruqyoMJxU/hlNoALx1QnFM8BlTsTd0pwlVrco3I="; + }) + ]; cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ]; nativeBuildInputs = [ cmake ]; @@ -27,7 +45,5 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } -- cgit 1.4.1