diff --git a/pkgs/applications/radio/qdmr/default.nix b/pkgs/by-name/qd/qdmr/package.nix similarity index 90% rename from pkgs/applications/radio/qdmr/default.nix rename to pkgs/by-name/qd/qdmr/package.nix index a9ea80e13e9a..9e5ac1f5ab56 100644 --- a/pkgs/applications/radio/qdmr/default.nix +++ b/pkgs/by-name/qd/qdmr/package.nix @@ -6,12 +6,8 @@ cmake, libxslt, docbook_xsl_ns, - wrapQtAppsHook, + libsForQt5, libusb1, - qtlocation, - qtserialport, - qttools, - qtbase, yaml-cpp, }: @@ -33,16 +29,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake libxslt - wrapQtAppsHook + libsForQt5.wrapQtAppsHook installShellFiles ]; buildInputs = [ libusb1 - qtlocation - qtserialport - qttools - qtbase + libsForQt5.qtlocation + libsForQt5.qtserialport + libsForQt5.qttools + libsForQt5.qtbase yaml-cpp ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36494e8e6c9..7329cc0fb2e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -514,8 +514,6 @@ with pkgs; python3Packages = python311Packages; }; - qdmr = libsForQt5.callPackage ../applications/radio/qdmr { }; - fetchbower = callPackage ../build-support/fetchbower { }; fetchbzr = callPackage ../build-support/fetchbzr { };