From 6e90cd6ff337dd6ea49aa7cd6af6bd47b015e595 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sat, 18 Oct 2025 17:04:05 -0700
Subject: [PATCH] jamesdsp: modernize, move to by-name/

---
 .../ja}/jamesdsp/fix-build-on-qt6_9.diff       |  0
 .../ja/jamesdsp/package.nix}                   | 18 +++++++-----------
 pkgs/top-level/all-packages.nix                |  3 +--
 3 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio => by-name/ja}/jamesdsp/fix-build-on-qt6_9.diff (100%)
 rename pkgs/{applications/audio/jamesdsp/default.nix => by-name/ja/jamesdsp/package.nix} (93%)

diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/by-name/ja/jamesdsp/fix-build-on-qt6_9.diff
similarity index 100%
rename from pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff
rename to pkgs/by-name/ja/jamesdsp/fix-build-on-qt6_9.diff
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/by-name/ja/jamesdsp/package.nix
similarity index 93%
rename from pkgs/applications/audio/jamesdsp/default.nix
rename to pkgs/by-name/ja/jamesdsp/package.nix
index a3917e48f509..6d7408c76ead 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/by-name/ja/jamesdsp/package.nix
@@ -10,14 +10,10 @@
   pipewire,
   pkg-config,
   pulseaudio,
-  qmake,
-  qtbase,
-  qtsvg,
-  qtwayland,
   stdenv,
   usePipewire ? true,
   usePulseaudio ? false,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 assert lib.asserts.assertMsg (
@@ -32,15 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Audio4Linux";
     repo = "JDSP4Linux";
     fetchSubmodules = true;
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8=";
   };
 
   nativeBuildInputs = [
-    qmake
+    kdePackages.qmake
     pkg-config
     copyDesktopItems
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   patches = [
@@ -55,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glibmm
     libarchive
-    qtbase
-    qtsvg
-    qtwayland
+    kdePackages.qtbase
+    kdePackages.qtsvg
+    kdePackages.qtwayland
   ]
   ++ lib.optionals usePipewire [
     pipewire
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e794aad93dc..99ac71eaeac3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3143,8 +3143,7 @@ with pkgs;
 
   jackett = callPackage ../servers/jackett { };
 
-  jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
-  jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
+  jamesdsp-pulse = callPackage ../by-name/ja/jamesdsp/package.nix {
     usePipewire = false;
     usePulseaudio = true;
   };