diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/by-name/au/audacious-bare/package.nix
similarity index 88%
rename from pkgs/applications/audio/audacious/default.nix
rename to pkgs/by-name/au/audacious-bare/package.nix
index 953569575b20..543f213b3826 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/by-name/au/audacious-bare/package.nix
@@ -6,10 +6,8 @@
   meson,
   ninja,
   pkg-config,
-  qtbase,
-  qtsvg,
-  qtwayland,
-  wrapQtAppsHook,
+  qt6,
+  withPlugins ? false,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,13 +25,13 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qtwayland
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtwayland
   ];
 
   mesonFlags = [
@@ -41,7 +39,7 @@ stdenv.mkDerivation rec {
     "-Dbuildstamp=NixOS"
   ];
 
-  postInstall = lib.optionalString (audacious-plugins != null) ''
+  postInstall = lib.optionalString withPlugins ''
     ln -s ${audacious-plugins}/lib/audacious $out/lib
     ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8fe79febbf7..825110881763 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13382,8 +13382,7 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  audacious-bare = audacious.override { audacious-plugins = null; };
-  audacious = qt6Packages.callPackage ../applications/audio/audacious { };
+  audacious = audacious-bare.override { withPlugins = true; };
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };