From fa9cc1b2a0f60805ced5e66367f4210cb43b1806 Mon Sep 17 00:00:00 2001
From: colin <colin@uninsane.org>
Date: Fri, 16 Dec 2022 00:05:53 +0000
Subject: [PATCH] kiwix: split libkiwix out its own toplevel package

this allows libkiwix to be more easily used by non-nixpkgs consumers.
---
 pkgs/applications/misc/kiwix/default.nix |  4 ++--
 pkgs/applications/misc/kiwix/lib.nix     | 10 +++++++++-
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 3263f0f992d1..49c0155bf985 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,5 +1,5 @@
 { lib, mkDerivation, fetchFromGitHub
-, callPackage
+, libkiwix
 , pkg-config
 , qmake
 , qtbase
@@ -26,11 +26,11 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    libkiwix
     qtbase
     qtwebengine
     qtsvg
     qtimageformats
-    (callPackage ./lib.nix {})
   ];
 
   qtWrapperArgs = [
diff --git a/pkgs/applications/misc/kiwix/lib.nix b/pkgs/applications/misc/kiwix/lib.nix
index 4e3ff063aa57..ffbcd1bb3016 100644
--- a/pkgs/applications/misc/kiwix/lib.nix
+++ b/pkgs/applications/misc/kiwix/lib.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ lib, stdenv, fetchFromGitHub
 , meson, ninja, pkg-config
 , python3
 , curl
@@ -51,4 +51,12 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs scripts
   '';
+
+  meta = with lib; {
+    description = "Common code base for all Kiwix ports";
+    homepage = "https://kiwix.org";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ colinsane ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 887b29613371..4266a723337f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30172,6 +30172,8 @@ with pkgs;
 
   leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
 
+  libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
+
   libowfat = callPackage ../development/libraries/libowfat { };
 
   libowlevelzs = callPackage ../development/libraries/libowlevelzs { };