From 4637550101bd8b72cd92362ff62829bcc1dfb677 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:19:02 +0000
Subject: [PATCH] audacious-plugins: move to pkgs/by-name

---
 .../0001-Set-plugindir-to-PREFIX-lib-audacious.patch   |  0
 .../au/audacious-plugins/package.nix}                  | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  1 -
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename pkgs/{applications/audio/audacious => by-name/au/audacious-plugins}/0001-Set-plugindir-to-PREFIX-lib-audacious.patch (100%)
 rename pkgs/{applications/audio/audacious/plugins.nix => by-name/au/audacious-plugins/package.nix} (95%)

diff --git a/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch b/pkgs/by-name/au/audacious-plugins/0001-Set-plugindir-to-PREFIX-lib-audacious.patch
similarity index 100%
rename from pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch
rename to pkgs/by-name/au/audacious-plugins/0001-Set-plugindir-to-PREFIX-lib-audacious.patch
diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/by-name/au/audacious-plugins/package.nix
similarity index 95%
rename from pkgs/applications/audio/audacious/plugins.nix
rename to pkgs/by-name/au/audacious-plugins/package.nix
index 3012ac0d4f60..5614a0450e04 100644
--- a/pkgs/applications/audio/audacious/plugins.nix
+++ b/pkgs/by-name/au/audacious-plugins/package.nix
@@ -37,9 +37,7 @@
   pkg-config,
   opusfile,
   pipewire,
-  qtbase,
-  qtmultimedia,
-  qtwayland,
+  qt6,
   soxr,
   vgmstream,
   wavpack,
@@ -97,9 +95,9 @@ stdenv.mkDerivation rec {
     neon
     opusfile
     pipewire
-    qtbase
-    qtmultimedia
-    qtwayland
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwayland
     soxr
     wavpack
     libopenmpt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e924eb7f29c..b8fe79febbf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13384,7 +13384,6 @@ with pkgs;
 
   audacious-bare = audacious.override { audacious-plugins = null; };
   audacious = qt6Packages.callPackage ../applications/audio/audacious { };
-  audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix { };
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };