From 0d1e5fd68008ccc0c3a830e5213f77afd42192e7 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:54:01 -0700
Subject: [PATCH] jackmix: modernize, move to by-name/

---
 .../audio => by-name/ja}/jackmix/no_error.patch     |  0
 .../default.nix => by-name/ja/jackmix/package.nix}  | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{applications/audio => by-name/ja}/jackmix/no_error.patch (100%)
 rename pkgs/{applications/audio/jackmix/default.nix => by-name/ja/jackmix/package.nix} (88%)

diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/by-name/ja/jackmix/no_error.patch
similarity index 100%
rename from pkgs/applications/audio/jackmix/no_error.patch
rename to pkgs/by-name/ja/jackmix/no_error.patch
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/by-name/ja/jackmix/package.nix
similarity index 88%
rename from pkgs/applications/audio/jackmix/default.nix
rename to pkgs/by-name/ja/jackmix/package.nix
index d4a0bf6064a4..7b57e6571bcb 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/by-name/ja/jackmix/package.nix
@@ -1,25 +1,25 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   pkg-config,
   scons,
-  qtbase,
   lash,
   libjack2,
   jack ? libjack2,
   alsa-lib,
+  libsForQt5,
   fetchpatch,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jackmix";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kampfschlaefer";
     repo = "jackmix";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
@@ -35,9 +35,10 @@ mkDerivation rec {
   nativeBuildInputs = [
     scons
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     lash
     jack
     alsa-lib
@@ -55,4 +56,4 @@ mkDerivation rec {
     maintainers = with maintainers; [ kampfschlaefer ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96ce666dc72a..8b0c025fd583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11578,7 +11578,6 @@ with pkgs;
     subproject = "reader";
   };
 
-  jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
   js8call = qt5.callPackage ../applications/radio/js8call { };