From bad67f4f1ac73ad1ffab0f8828fa47cafdf9e5e0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 8 Feb 2026 09:21:09 -0600
Subject: [PATCH 1/2] q4wine: migrate to by-name

---
 .../default.nix => by-name/q4/q4wine/package.nix}   | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/q4wine/default.nix => by-name/q4/q4wine/package.nix} (90%)

diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/by-name/q4/q4wine/package.nix
similarity index 90%
rename from pkgs/applications/misc/q4wine/default.nix
rename to pkgs/by-name/q4/q4wine/package.nix
index 5a93c793e10f..23f35e220974 100644
--- a/pkgs/applications/misc/q4wine/default.nix
+++ b/pkgs/by-name/q4/q4wine/package.nix
@@ -4,10 +4,7 @@
   stdenv,
   cmake,
   sqlite,
-  qtbase,
-  qtsvg,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
   icoutils, # build and runtime deps.
   wget,
   fuseiso,
@@ -29,14 +26,14 @@ stdenv.mkDerivation rec {
   buildInputs = [
     sqlite
     icoutils
-    qtbase
-    qtsvg
-    qttools
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   # Add runtime deps.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ca745747ca7..a2e1933dc639 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9598,8 +9598,6 @@ with pkgs;
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
-  q4wine = kdePackages.callPackage ../applications/misc/q4wine { };
-
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 
   gpsbabel-gui = gpsbabel.override {

From be9140fb2c1778ccd19af040babb454840eb6d70 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 8 Feb 2026 09:22:26 -0600
Subject: [PATCH 2/2] q4wine: modernize derivation

---
 pkgs/by-name/q4/q4wine/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/q4/q4wine/package.nix b/pkgs/by-name/q4/q4wine/package.nix
index 23f35e220974..bae5afc03705 100644
--- a/pkgs/by-name/q4/q4wine/package.nix
+++ b/pkgs/by-name/q4/q4wine/package.nix
@@ -12,15 +12,15 @@
   which, # runtime deps.
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "q4wine";
   version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "brezerk";
     repo = "q4wine";
-    rev = "v${version}";
-    sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I=";
   };
 
   buildInputs = [
@@ -57,4 +57,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ rkitover ];
     platforms = lib.platforms.unix;
   };
-}
+})