From d64db7c1fb3dbe48585f73bc5f307a22379de06f Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Wed, 4 Jun 2025 14:54:17 +0800
Subject: [PATCH] zim-tools: 3.5.0 -> 3.6.0

Diff: https://github.com/openzim/zim-tools/compare/refs/tags/3.5.0...refs/tags/3.6.0
---
 .../by-name/zi/zim-tools/fix_build_with_icu76.patch | 13 ++++++-------
 pkgs/by-name/zi/zim-tools/package.nix               | 10 +++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/zi/zim-tools/fix_build_with_icu76.patch b/pkgs/by-name/zi/zim-tools/fix_build_with_icu76.patch
index 5313f1f3370a..1ef6a1f830a9 100644
--- a/pkgs/by-name/zi/zim-tools/fix_build_with_icu76.patch
+++ b/pkgs/by-name/zi/zim-tools/fix_build_with_icu76.patch
@@ -2,17 +2,16 @@ diff --git a/meson.build b/meson.build
 index 344bbaf..ddad570 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -17,8 +17,11 @@ if static_linkage
+@@ -17,7 +17,11 @@
    endif
  endif
- 
--libzim_dep = dependency('libzim', version:'>=9.2.0', static:static_linkage)
--libzim_dep = dependency('libzim', version:'<10.0.0', static:static_linkage)
+
+-libzim_dep = dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage)
 +libzim_dep = [
 +  dependency('libzim', version:['>=9.2.0', '<10.0.0'], static:static_linkage),
 +  dependency('icu-i18n', static:static_linkage),
 +  dependency('icu-uc', static:static_linkage)
 +]
- 
- with_xapian_support = compiler.has_header_symbol('zim/zim.h', 'LIBZIM_WITH_XAPIAN')
- 
+
+ with_xapian_support = compiler.has_header_symbol(
+   'zim/zim.h', 'LIBZIM_WITH_XAPIAN', dependencies: libzim_dep)
diff --git a/pkgs/by-name/zi/zim-tools/package.nix b/pkgs/by-name/zi/zim-tools/package.nix
index 9fabae99cd67..9dcf8baa538d 100644
--- a/pkgs/by-name/zi/zim-tools/package.nix
+++ b/pkgs/by-name/zi/zim-tools/package.nix
@@ -15,15 +15,15 @@
   gtest,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zim-tools";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "openzim";
     repo = "zim-tools";
-    tag = version;
-    hash = "sha256-gcCo3u1pLm1CnTF3CATOri5+zat839zUbmQnMOVjanI=";
+    tag = finalAttrs.version;
+    hash = "sha256-8+/3+FOq35FSYzpQdpqs5MTMtUO5SYbKLPECFi+IIKw=";
   };
 
   patches = [
@@ -59,4 +59,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
   };
-}
+})