diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/by-name/cm/cmst/package.nix similarity index 83% rename from pkgs/tools/networking/cmst/default.nix rename to pkgs/by-name/cm/cmst/package.nix index 54189d208331..a6cfdf31b42a 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/by-name/cm/cmst/package.nix @@ -1,14 +1,12 @@ { - mkDerivation, + stdenv, lib, fetchFromGitHub, - qmake, - qtbase, - qttools, + libsForQt5, gitUpdater, }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "cmst"; version = "2023.03.14"; @@ -20,11 +18,12 @@ mkDerivation rec { }; nativeBuildInputs = [ - qmake - qttools + libsForQt5.qmake + libsForQt5.qttools + libsForQt5.wrapQtAppsHook ]; - buildInputs = [ qtbase ]; + buildInputs = [ libsForQt5.qtbase ]; postPatch = '' for f in $(find . -name \*.cpp -o -name \*.pri -o -name \*.pro); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c016abf7744..3e784aac07e9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2302,8 +2302,6 @@ with pkgs; ; citrix_workspace = citrix_workspace_25_05_0; - cmst = libsForQt5.callPackage ../tools/networking/cmst { }; - colord-gtk4 = colord-gtk.override { withGtk4 = true; }; connmanFull = connman.override {