From a58cc7317fa0f6af50298055bca5983964d41247 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sat, 28 Dec 2024 22:47:53 +0300 Subject: [PATCH 1/2] kakasi: avoid an implicit declaration of `exit`. This caused the following false alarm: ``` error: can not use EUC-JP or UTF-8 encoding on iconv ``` See https://git.launchpad.net/ubuntu/+source/kakasi/commit/?h=applied/ubuntu/plucky&id=08f53a5. --- pkgs/by-name/ka/kakasi/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ka/kakasi/package.nix b/pkgs/by-name/ka/kakasi/package.nix index af749f436f29..cd7b803ced09 100644 --- a/pkgs/by-name/ka/kakasi/package.nix +++ b/pkgs/by-name/ka/kakasi/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + fetchpatch, + autoreconfHook, libiconv, }: @@ -9,6 +11,7 @@ stdenv.mkDerivation rec { pname = "kakasi"; version = "2.3.6"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; meta = with lib; { @@ -28,6 +31,13 @@ stdenv.mkDerivation rec { sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f"; }; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/kakasi/raw/4756771/f/kakasi-configure-c99.patch"; + hash = "sha256-XPIp/+AR6K84lv606aRHPQwia/1K3rt/7KSo0V0ZQ5o="; + }) + ]; + postPatch = '' for a in tests/kakasi-* ; do substituteInPlace $a \ From 1cc583ea184d7523aed4f4cbe48605832e148b49 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 29 Dec 2024 13:23:43 +0300 Subject: [PATCH 2/2] kakasi: replace `--replace` with `--replace-quiet`. --- pkgs/by-name/ka/kakasi/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ka/kakasi/package.nix b/pkgs/by-name/ka/kakasi/package.nix index cd7b803ced09..c5623479ae04 100644 --- a/pkgs/by-name/ka/kakasi/package.nix +++ b/pkgs/by-name/ka/kakasi/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { postPatch = '' for a in tests/kakasi-* ; do substituteInPlace $a \ - --replace "/bin/echo" echo + --replace-quiet "/bin/echo" echo done '';