From fece93b6d65c3b96023f3089f17d341c3830f1c1 Mon Sep 17 00:00:00 2001
From: KSJ2000 <katsho123@outlook.com>
Date: Sun, 24 Nov 2024 13:13:16 +0200
Subject: [PATCH 1/2] qbittorrent-enhanced: 4.6.7.10 -> 5.0.2.10

---
 pkgs/by-name/qb/qbittorrent-enhanced/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
index 7b73e1f660c91..ab78f36dae91e 100644
--- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
+++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
@@ -6,25 +6,25 @@
 , boost
 , libtorrent-rasterbar
 , openssl
-, qt5
+, qt6
 , zlib
 }:
 
 stdenv.mkDerivation rec {
   pname = "qbittorrent-enhanced";
-  version = "4.6.7.10";
+  version = "5.0.2.10";
 
   src = fetchFromGitHub {
     owner = "c0re100";
     repo = "qBittorrent-Enhanced-Edition";
     rev = "release-${version}";
-    hash = "sha256-Mr376nH2pE6NMF9IdDhZULwqkRr7472OZnKO86hb6ZI=";
+    hash = "sha256-9RCG530zWQ+qzP0Y+y69NFlBWVA8GT29dY8aC1cvq7o=";
   };
 
   nativeBuildInputs = [
     pkg-config
     cmake
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -32,8 +32,9 @@ stdenv.mkDerivation rec {
     boost
     zlib
     libtorrent-rasterbar
-    qt5.qtbase
-    qt5.qttools
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
   ];
 
   meta = {

From 612f8258d728e8d5b13cc4416bbac7892d954563 Mon Sep 17 00:00:00 2001
From: KSJ2000 <katsho123@outlook.com>
Date: Fri, 29 Nov 2024 11:49:44 +0200
Subject: [PATCH 2/2] qbittorrent-enhanced: add nox version

---
 .../qb/qbittorrent-enhanced/package.nix       | 44 +++++--------------
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
index ab78f36dae91e..82fd6dcc95272 100644
--- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
+++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix
@@ -1,17 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, boost
-, libtorrent-rasterbar
-, openssl
-, qt6
-, zlib
+{
+  lib,
+  fetchFromGitHub,
+  qbittorrent,
+  guiSupport ? true,
 }:
 
-stdenv.mkDerivation rec {
-  pname = "qbittorrent-enhanced";
+(qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec {
+  pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox";
   version = "5.0.2.10";
 
   src = fetchFromGitHub {
@@ -21,29 +16,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-9RCG530zWQ+qzP0Y+y69NFlBWVA8GT29dY8aC1cvq7o=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-    qt6.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    openssl.dev
-    boost
-    zlib
-    libtorrent-rasterbar
-    qt6.qtbase
-    qt6.qtsvg
-    qt6.qttools
-  ];
-
-  meta = {
+  meta = old.meta // {
     description = "Unofficial enhanced version of qBittorrent, a BitTorrent client";
     homepage = "https://github.com/c0re100/qBittorrent-Enhanced-Edition";
-    changelog = "https://github.com/c0re100/qBittorrent-Enhanced-Edition/blob/${src.rev}/Changelog";
-    license = with lib.licenses; [ gpl2Only gpl3Only ];
+    changelog = "https://github.com/c0re100/qBittorrent-Enhanced-Edition/blob/release-${version}/Changelog";
     maintainers = with lib.maintainers; [ ByteSudoer ];
-    mainProgram = "qBittorrent-enhanced";
-    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3aa1e178d9e1..add2f1bdcb2b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15462,6 +15462,8 @@ with pkgs;
   };
   qbittorrent-nox = qbittorrent.override { guiSupport = false; };
 
+  qbittorrent-enhanced-nox = qbittorrent-enhanced.override { guiSupport = false; };
+
   qcad = libsForQt5.callPackage ../applications/misc/qcad { };
 
   qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };