From d099ad0a0ecdf28e6a6eb677c7a18416eed99a3c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 12 Dec 2024 15:30:24 +0100
Subject: [PATCH] spotify-qt: 3.11 -> 3.12

---
 .../applications/audio/spotify-qt/default.nix | 31 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/applications/audio/spotify-qt/default.nix
index 01600dbf5ca7..abb40e9ed468 100644
--- a/pkgs/applications/audio/spotify-qt/default.nix
+++ b/pkgs/applications/audio/spotify-qt/default.nix
@@ -1,38 +1,47 @@
 {
-  stdenvNoCC,
+  stdenv,
   fetchFromGitHub,
   lib,
   cmake,
-  mkDerivation,
   libxcb,
   qtbase,
   qtsvg,
+  wrapQtAppsHook,
+  procps,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spotify-qt";
-  version = "3.11";
+  version = "3.12";
 
   src = fetchFromGitHub {
     owner = "kraxarn";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-Dm+ELHtYZGSzJSrERtvpuuV5cVZ9ah9WQ0iTTJqGqVg=";
+    repo = "spotify-qt";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-j9g2fq12gsue0pc/fLoCAtDlwwlbCVJ65kxPiTJTqvk=";
   };
 
+  postPatch = ''
+    substituteInPlace src/spotifyclient/helper.cpp \
+      --replace-fail /usr/bin/ps ${lib.getExe' procps "ps"}
+  '';
+
   buildInputs = [
     libxcb
     qtbase
     qtsvg
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
 
-  cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=" ];
+  cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") ];
 
   installFlags = [ "DESTDIR=$(out)" ];
 
-  postInstall = lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/Applications
     mv $out/bin/spotify-qt.app $out/Applications
     ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt
@@ -46,4 +55,4 @@ mkDerivation rec {
     maintainers = with maintainers; [ iivusly ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a81e3ccada7..d0967333170e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15495,7 +15495,7 @@ with pkgs;
 
   sommelier = callPackage ../applications/window-managers/sommelier { };
 
-  spotify-qt = libsForQt5.callPackage ../applications/audio/spotify-qt { };
+  spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { };
 
   squishyball = callPackage ../applications/audio/squishyball {
     ncurses = ncurses5;