From 780aa2379092d0f11ec55466170e7d90e9515196 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 25 Sep 2024 19:21:17 -0300
Subject: [PATCH 1/3] bibletime: libsForQt5.callPackage -> callPackage

---
 pkgs/applications/misc/bibletime/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 1b7fde5d7de8..619bca65ed0a 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -4,17 +4,17 @@
 , cmake
 , docbook_xml_dtd_45
 , pkg-config
-, wrapQtAppsHook
 , boost
 , clucene_core_2
 , docbook_xsl_ns
 , perlPackages
-, qtbase
-, qtsvg
-, qttools
 , sword
+, qt5
 }:
 
+let
+  inherit (qt5) qtbase qtsvg qttools wrapQtAppsHook;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bibletime";
   version = "3.0.3";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e0dffbeec0a..7030807d8235 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28573,7 +28573,7 @@ with pkgs;
 
   bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
 
-  bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
+  bibletime = callPackage ../applications/misc/bibletime { };
 
   bino3d = qt6Packages.callPackage ../applications/video/bino3d { };
 

From b38bd06347fda29a5060d3e6a2dfae05f9f81d47 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 25 Sep 2024 19:24:15 -0300
Subject: [PATCH 2/3] bibletime: migrate to by-name

---
 .../bibletime/default.nix => by-name/bi/bibletime/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/bibletime/default.nix => by-name/bi/bibletime/package.nix} (100%)

diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/by-name/bi/bibletime/package.nix
similarity index 100%
rename from pkgs/applications/misc/bibletime/default.nix
rename to pkgs/by-name/bi/bibletime/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7030807d8235..094dd318bdde 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28573,8 +28573,6 @@ with pkgs;
 
   bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
 
-  bibletime = callPackage ../applications/misc/bibletime { };
-
   bino3d = qt6Packages.callPackage ../applications/video/bino3d { };
 
   bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { };

From 3a2b613ecac020ba61ca5b2752b5f672ef578179 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 25 Sep 2024 20:05:26 -0300
Subject: [PATCH 3/3] bibletime: refactor

- use lib.*
- strictDeps
- no nested with
---
 pkgs/by-name/bi/bibletime/package.nix | 52 +++++++++++++++------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/bi/bibletime/package.nix b/pkgs/by-name/bi/bibletime/package.nix
index 619bca65ed0a..2c95eb11b25b 100644
--- a/pkgs/by-name/bi/bibletime/package.nix
+++ b/pkgs/by-name/bi/bibletime/package.nix
@@ -1,19 +1,25 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, docbook_xml_dtd_45
-, pkg-config
-, boost
-, clucene_core_2
-, docbook_xsl_ns
-, perlPackages
-, sword
-, qt5
+{
+  lib,
+  boost,
+  clucene_core_2,
+  cmake,
+  docbook_xml_dtd_45,
+  docbook_xsl_ns,
+  fetchFromGitHub,
+  perlPackages,
+  pkg-config,
+  qt5,
+  stdenv,
+  sword,
 }:
 
 let
-  inherit (qt5) qtbase qtsvg qttools wrapQtAppsHook;
+  inherit (qt5)
+    qtbase
+    qtsvg
+    qttools
+    wrapQtAppsHook
+    ;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bibletime";
@@ -31,12 +37,12 @@ stdenv.mkDerivation (finalAttrs: {
     docbook_xml_dtd_45
     pkg-config
     wrapQtAppsHook
+    perlPackages.Po4a
   ];
 
   buildInputs = [
     boost
     clucene_core_2
-    perlPackages.Po4a
     qtbase
     qtsvg
     qttools
@@ -49,18 +55,20 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   cmakeFlags = [
-    "-DBUILD_HOWTO_PDF=OFF"
-    "-DBUILD_HANDBOOK_PDF=OFF"
-    "-DBT_DOCBOOK_XSL_HTML_CHUNK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"
-    "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"
+    (lib.cmakeBool "BUILD_HOWTO_PDF" false)
+    (lib.cmakeBool "BUILD_HANDBOOK_PDF" false)
+    (lib.cmakeFeature "BT_DOCBOOK_XSL_HTML_CHUNK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl")
+    (lib.cmakeFeature "BT_DOCBOOK_XSL_PDF_DOCBOOK_XSL" "${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl")
   ];
 
-  meta = with lib; {
+  strictDeps = true;
+
+  meta = {
     homepage = "http://www.bibletime.info/";
     description = "Powerful cross platform Bible study tool";
+    license = lib.licenses.gpl2Plus;
     mainProgram = "bibletime";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.linux;
   };
 })