From daa85758e490ec9e4f9b2cf3b19e3bb9bba9a1bd Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 4 Jan 2026 13:38:02 +0100
Subject: [PATCH 1/3] kakasi: fix build for gcc15

---
 pkgs/by-name/ka/kakasi/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ka/kakasi/package.nix b/pkgs/by-name/ka/kakasi/package.nix
index 7064324c6a85..f607dd1d74b2 100644
--- a/pkgs/by-name/ka/kakasi/package.nix
+++ b/pkgs/by-name/ka/kakasi/package.nix
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
     ./gettext-0.25.patch
   ];
 
+  env = lib.optionalAttrs (!stdenv.cc.isClang) {
+    NIX_CFLAGS_COMPILE = "-std=gnu17";
+  };
+
   postPatch = ''
     for a in tests/kakasi-* ; do
       substituteInPlace $a \

From c7e82bd6c283624970c7c964b50f47bedf5d85bb Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 4 Jan 2026 13:38:45 +0100
Subject: [PATCH 2/3] kakasi: modernize

---
 pkgs/by-name/ka/kakasi/package.nix | 35 +++++++++++++++---------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ka/kakasi/package.nix b/pkgs/by-name/ka/kakasi/package.nix
index f607dd1d74b2..80b3014bfa31 100644
--- a/pkgs/by-name/ka/kakasi/package.nix
+++ b/pkgs/by-name/ka/kakasi/package.nix
@@ -7,27 +7,12 @@
   libiconv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "kakasi";
   version = "2.3.6";
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  meta = {
-    description = "Kanji Kana Simple Inverter";
-    longDescription = ''
-      KAKASI is the language processing filter to convert Kanji
-      characters to Hiragana, Katakana or Romaji and may be
-      helpful to read Japanese documents.
-    '';
-    homepage = "http://kakasi.namazu.org/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-
   src = fetchurl {
-    url = "http://kakasi.namazu.org/stable/kakasi-${version}.tar.xz";
+    url = "http://kakasi.namazu.org/stable/kakasi-${finalAttrs.version}.tar.xz";
     sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f";
   };
 
@@ -39,6 +24,9 @@ stdenv.mkDerivation rec {
     ./gettext-0.25.patch
   ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
+
   env = lib.optionalAttrs (!stdenv.cc.isClang) {
     NIX_CFLAGS_COMPILE = "-std=gnu17";
   };
@@ -52,4 +40,15 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails 1 of 6 tests
 
-}
+  meta = {
+    description = "Kanji Kana Simple Inverter";
+    longDescription = ''
+      KAKASI is the language processing filter to convert Kanji
+      characters to Hiragana, Katakana or Romaji and may be
+      helpful to read Japanese documents.
+    '';
+    homepage = "http://kakasi.namazu.org/";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+  };
+})

From 3bf32efeea9f1a3ab27ca7149eb6603dea9b74ba Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 4 Jan 2026 13:39:52 +0100
Subject: [PATCH 3/3] kakasi: use sri hash

---
 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 80b3014bfa31..9d6d8d0b3244 100644
--- a/pkgs/by-name/ka/kakasi/package.nix
+++ b/pkgs/by-name/ka/kakasi/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "http://kakasi.namazu.org/stable/kakasi-${finalAttrs.version}.tar.xz";
-    sha256 = "1qry3xqb83pjgxp3my8b1sy77z4f0893h73ldrvdaky70cdppr9f";
+    hash = "sha256-LuV7GwPHT9V2bnQcOBICjvxzvA4L+Tpuf/IOtHAfPuM=";
   };
 
   patches = [