From a05b26dd032bb73f0cd2d632da30105a54c780ef Mon Sep 17 00:00:00 2001
From: Chuang Zhu <git@chuang.cz>
Date: Wed, 23 Oct 2024 08:12:13 +0800
Subject: [PATCH] komikku: 1.57.0 -> 1.58.0; add webp support; move to by-name

---
 .../ko/komikku/package.nix}                   | 64 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 42 insertions(+), 24 deletions(-)
 rename pkgs/{applications/graphics/komikku/default.nix => by-name/ko/komikku/package.nix} (59%)

diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/by-name/ko/komikku/package.nix
similarity index 59%
rename from pkgs/applications/graphics/komikku/default.nix
rename to pkgs/by-name/ko/komikku/package.nix
index 53fa2a64350a..ab59d052d4c7 100644
--- a/pkgs/applications/graphics/komikku/default.nix
+++ b/pkgs/by-name/ko/komikku/package.nix
@@ -1,25 +1,29 @@
-{ lib
-, fetchFromGitea
-, desktop-file-utils
-, gettext
-, glib
-, gobject-introspection
-, blueprint-compiler
-, gtk4
-, libadwaita
-, libnotify
-, webkitgtk_6_0
-, meson
-, ninja
-, pkg-config
-, python3
-, wrapGAppsHook4
-, nix-update-script
+{
+  lib,
+  fetchFromGitea,
+  desktop-file-utils,
+  gettext,
+  glib,
+  gobject-introspection,
+  blueprint-compiler,
+  gtk4,
+  libadwaita,
+  libnotify,
+  webkitgtk_6_0,
+  meson,
+  ninja,
+  pkg-config,
+  python3,
+  wrapGAppsHook4,
+  librsvg,
+  gnome,
+  webp-pixbuf-loader,
+  nix-update-script,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.57.0";
+  version = "1.58.0";
 
   format = "other";
 
@@ -28,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-b2XoywPnrYnuehR6xHH8BvhbMZFB1AeBN0khFfaLGn0=";
+    hash = "sha256-21ZtzWjyUC+/iPv+R1DUzCHITR8GVhN+6iepcTIRy0Y=";
   };
 
   nativeBuildInputs = [
@@ -74,6 +78,19 @@ python3.pkgs.buildPythonApplication rec {
   # Tests require network
   doCheck = false;
 
+  # Pull in WebP support for manga pics of some servers.
+  # In postInstall to run before gappsWrapperArgsHook.
+  postInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
+  '';
+
   # Prevent double wrapping.
   dontWrapGApps = true;
 
@@ -87,12 +104,15 @@ python3.pkgs.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Manga reader for GNOME";
     mainProgram = "komikku";
     homepage = "https://apps.gnome.org/Komikku/";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}";
-    maintainers = with maintainers; [ chuangzhu infinitivewitch ];
+    maintainers = with lib.maintainers; [
+      chuangzhu
+      infinitivewitch
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e23aed3be66..260385dbcd82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28987,8 +28987,6 @@ with pkgs;
 
   kerbrute = callPackage ../tools/security/kerbrute { };
 
-  komikku = callPackage ../applications/graphics/komikku { };
-
   kvmtool = callPackage ../applications/virtualization/kvmtool { };
 
   exrtools = callPackage ../applications/graphics/exrtools { };