diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/by-name/qm/qmmp/package.nix similarity index 94% rename from pkgs/applications/audio/qmmp/default.nix rename to pkgs/by-name/qm/qmmp/package.nix index 609ed4837a8d..afe7406a6a97 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/by-name/qm/qmmp/package.nix @@ -4,10 +4,7 @@ fetchurl, cmake, pkg-config, - qtbase, - qttools, - qtmultimedia, - wrapQtAppsHook, + qt6, # transports curl, libmms, @@ -67,14 +64,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ # basic requirements - qtbase - qttools - qtmultimedia + qt6.qtbase + qt6.qttools + qt6.qtmultimedia # transports curl libmms diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43ecd33124f6..87e8e3032f93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13817,8 +13817,6 @@ with pkgs; qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; - qmmp = qt6Packages.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { };