From 3ff6bd15586123dc38176075843c6202e878a46e Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Sun, 27 Jul 2025 21:07:07 +0300
Subject: [PATCH] qolibri: 2.1.5-unstable-2024-03-17 ->
 2.1.5-unstable-2025-01-18

---
 pkgs/applications/misc/qolibri/default.nix | 33 ++++++++++------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix
index bd4dfaf58a85..636344ebffd6 100644
--- a/pkgs/applications/misc/qolibri/default.nix
+++ b/pkgs/applications/misc/qolibri/default.nix
@@ -8,25 +8,15 @@
   qtwebengine,
   wrapQtAppsHook,
 }:
-
-let
-  eb = fetchFromGitHub {
-    owner = "mvf";
-    repo = "eb";
-    rev = "58e1c3bb9847ed5d05863f478f21e7a8ca3d74c8";
-    hash = "sha256-gZP+2P6fFADWht2c0hXmljVJQX8RpCq2mWP+KDi+GzE=";
-  };
-in
-
 stdenv.mkDerivation {
   pname = "qolibri";
-  version = "2.1.5-unstable-2024-03-17";
+  version = "2.1.5-unstable-2025-01-18";
 
   src = fetchFromGitHub {
     owner = "mvf";
     repo = "qolibri";
-    rev = "99f0771184fcb2c5f47aad11c16002ebb8469a3f";
-    hash = "sha256-ArupqwejOO2YK9a3Ky0j20dIHs1jIqJksNIb4K2jwgI=";
+    rev = "edc0683915c0a99872a4c04ff53afe0f5df101fb";
+    hash = "sha256-RPcA9pPbd86gJtoHxalDKze0t8DNg/uVQYp9eYTxxyc=";
   };
 
   nativeBuildInputs = [
@@ -41,7 +31,14 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
-    "-DQOLIBRI_EB_SOURCE_DIR=${eb}"
+    (lib.cmakeOptionType "filepath" "QOLIBRI_EB_SOURCE_DIR"
+      "${fetchFromGitHub {
+        owner = "mvf";
+        repo = "eb";
+        rev = "58e1c3bb9847ed5d05863f478f21e7a8ca3d74c8";
+        hash = "sha256-gZP+2P6fFADWht2c0hXmljVJQX8RpCq2mWP+KDi+GzE=";
+      }}"
+    )
   ];
 
   postInstall = ''
@@ -54,12 +51,12 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "EPWING reader for viewing Japanese dictionaries";
     homepage = "https://github.com/mvf/qolibri";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ azahi ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.azahi ];
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; # Looks like a libcxx version mismatch problem.
     mainProgram = "qolibri";
   };