From bea06ddf3546721446744b732265c4683b8533b9 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Thu, 15 Dec 2022 13:51:48 +0000
Subject: [PATCH] kiwix: 2.2.1 -> 2.3.1

changelog:
- 2.3.1
        - Fix the AppImage packaging. Now published AppImages work correctly on recent distrubution (mgautierfr 905)
        - Improve zim file picker (kelson42 886)
        - Do not show ServiceWorker zim file from the remote catalog (kelson42 887)
- 2.3.0
        - Fix downloading of file bigger than 4G (Juzz0 855)
        - Hide top widget and topbar in fullscreen (Juzz0 859)
        - Add shortcuts for navigating tabs (Ctrl-tab, Ctrl-shift-tab) (Juzz0 867)
        - Do not use deprecated method QWebEngineDownloadItem::setPath (Juzz0 853)
        - Fix compilation with last version of libkiwix (mgautierfr 858)
        - Fix README.md (psypherium 860)
        - Update translations.
- 2.2.2
        - Remove usage of deprecated libkiwix function (Juzz0 mgautiefr 831)
        - Adapt kiwix-desktop to last libkiwix api (mgautierfr 842, veloman-yunkan 844)
        - Do not search (and crash) on a zim file without fulltext index (mgautierfr 830)
        - Update translations.
        - [Flathub] Update link to screenshot

libkiwix changelog:
<https://github.com/kiwix/libkiwix/blob/0ae31bd181b1522cf1f7e7a8bbba3a840646dbbe/ChangeLog>

libkiwix now requires libzim to be compiled with xapian support.
kiwix-desktop fails to link of xapian isn't also found there, so i made
this part of `propagatedBuildInputs`. `xz` also needed to be propagated,
otherwise libkiwix would fail with
```
> meson.build:38:0: ERROR: Could not generate cargs for libzim:
> Package liblzma was not found in the pkg-config search path.
```

additionally, upstream renamed the repo to `libkiwix`. the old `kiwix-lib` repo redirects to
`libkiwix`, so i updated pname to reflect this.
---
 pkgs/applications/misc/kiwix/default.nix      |  4 ++--
 pkgs/applications/misc/kiwix/lib.nix          | 10 +++++-----
 pkgs/development/libraries/libzim/default.nix | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 7f13494f65f5..3263f0f992d1 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -11,13 +11,13 @@
 
 mkDerivation rec {
   pname = "kiwix";
-  version = "2.2.1";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "${pname}-desktop";
     rev = version;
-    sha256 = "sha256-ks2d/guMp5pb2tiwGxNp3htQVm65MsYvZ/6tNjGXNr8=";
+    sha256 = "sha256-ghx4pW6IkWPzZXk0TtMGeQZIzm9HEN3mR4XQFJ1xHDo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix
index 37f8203e047a..4e3ff063aa57 100644
--- a/pkgs/applications/misc/kiwix/lib.nix
+++ b/pkgs/applications/misc/kiwix/lib.nix
@@ -3,8 +3,8 @@
 , python3
 , curl
 , icu
+, libzim
 , pugixml
-, zimlib
 , zlib
 , libmicrohttpd
 , mustache-hpp
@@ -12,14 +12,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "kiwix-lib";
-  version = "10.1.1";
+  pname = "libkiwix";
+  version = "12.0.0";
 
   src = fetchFromGitHub {
     owner = "kiwix";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ECvdraN1J5XJQLeZDngxO5I7frwZ8+W8tFpbB7o8UeM=";
+    sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc=";
   };
 
   nativeBuildInputs = [
@@ -38,8 +38,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     curl
     libmicrohttpd
+    libzim
     pugixml
-    zimlib
   ];
 
   checkInputs = [
diff --git a/pkgs/development/libraries/libzim/default.nix b/pkgs/development/libraries/libzim/default.nix
index 23c3e902608a..1787af0a4014 100644
--- a/pkgs/development/libraries/libzim/default.nix
+++ b/pkgs/development/libraries/libzim/default.nix
@@ -5,6 +5,8 @@
 , meson
 , ninja
 , pkg-config
+, python3
+, xapian
 , xz
 , zstd
 }:
@@ -24,19 +26,27 @@ stdenv.mkDerivation rec {
     ninja
     meson
     pkg-config
+    python3
   ];
 
   buildInputs = [
     icu
-    xz
     zstd
   ];
 
+  propagatedBuildInputs = [
+    xapian
+    xz
+  ];
+
+  postPatch = ''
+    patchShebangs scripts
+  '';
+
   mesonFlags = [
     # Tests are located at https://github.com/openzim/zim-testing-suite
     # "...some tests need up to 16GB of memory..."
     "-Dtest_data_dir=none"
-    "-Dwith_xapian=false"
   ];
 
   meta = with lib; {