From 42c88817632df2c6b2a294e419d8d8c673673d79 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Fri, 6 Mar 2026 09:14:25 +0100
Subject: [PATCH] tclPackages.rl_json: 0.15.3 -> 0.15.7

---
 .../by-name/rl/rl_json/package.nix            | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
index fd67dfc347f9..aefab7d88c6f 100644
--- a/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
+++ b/pkgs/development/tcl-modules/by-name/rl/rl_json/package.nix
@@ -8,16 +8,33 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rl_json";
-  version = "0.15.3";
+  version = "0.15.7";
 
   src = fetchFromGitHub {
     owner = "RubyLane";
     repo = "rl_json";
-    rev = finalAttrs.version;
-    hash = "sha256-JyJBf8lMrO/P5grOMojqs1PRoMPRsPWGQYS33eB7bRI=";
+    tag = finalAttrs.version;
+    hash = "sha256-6Y6bq/Lm6KCFFV3RF6v4fVPEN1LO+jE2xZV50a8zyng=";
     fetchSubmodules = true;
   };
 
+  # The vendored libtommath conflicts with tclTomMath.
+  # Replacing it with tclTomMath fixes the issue.
+  # https://github.com/RubyLane/rl_json/issues/57
+  # The switch to a vendored libtommath was done in 0.15.4 in commit
+  # https://github.com/RubyLane/rl_json/commit/9294d533f4d81288acf53045666b1587cf7fbf92
+  # "for proper bignum handling", but the commit message doesn't explain what's wrong
+  # with tclTomMath's bignum handling and all tests pass anyway.
+  postPatch = ''
+    rm -r deps/libtommath
+    substituteInPlace Makefile.in \
+      --replace-fail 'deps: local/lib/libtommath.a' 'deps:'
+    substituteInPlace configure.ac \
+      --replace-fail -ltommath ""
+    substituteInPlace generic/rl_jsonInt.h \
+      --replace-fail '#include <tommath.h>' '#include <tclTomMath.h>'
+  '';
+
   nativeBuildInputs = [
     autoreconfHook
     tcl.tclPackageHook
@@ -30,6 +47,10 @@ stdenv.mkDerivation (finalAttrs: {
     "--datarootdir=${placeholder "out"}/share"
   ];
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+
+  doCheck = true;
+
   meta = {
     homepage = "https://github.com/RubyLane/rl_json";
     description = "Tcl extension for fast json manipulation";