From a892cc7cd3663785fe35229b43c4f9129f51f7e2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 16:58:29 -0700
Subject: [PATCH] spotify-qt: modernize, move to by-name/

---
 .../sp/spotify-qt/package.nix}                | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/spotify-qt/default.nix => by-name/sp/spotify-qt/package.nix} (79%)

diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/by-name/sp/spotify-qt/package.nix
similarity index 79%
rename from pkgs/applications/audio/spotify-qt/default.nix
rename to pkgs/by-name/sp/spotify-qt/package.nix
index 5d81c51ddbd7..95829d972ec2 100644
--- a/pkgs/applications/audio/spotify-qt/default.nix
+++ b/pkgs/by-name/sp/spotify-qt/package.nix
@@ -4,10 +4,8 @@
   lib,
   cmake,
   libxcb,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
   procps,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kraxarn";
     repo = "spotify-qt";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-R6ucuQdntc1OxDCV8jDAlyjAo/393HN7fjRJH70OdNs=";
   };
 
@@ -28,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    qtbase
-    qtsvg
+    kdePackages.qtbase
+    kdePackages.qtsvg
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") ];
@@ -47,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
     ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight unofficial Spotify client using Qt";
     mainProgram = "spotify-qt";
     homepage = "https://github.com/kraxarn/spotify-qt";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iivusly ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ iivusly ];
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6845572ed24..0e794aad93dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12403,8 +12403,6 @@ with pkgs;
 
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
-  spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { };
-
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };