diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/by-name/cl/clementine/package.nix similarity index 92% rename from pkgs/applications/audio/clementine/default.nix rename to pkgs/by-name/cl/clementine/package.nix index 9f50ae01c971..0b93d566a882 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/by-name/cl/clementine/package.nix @@ -7,14 +7,11 @@ chromaprint, gettext, gst_all_1, - liblastfm, - qtbase, - qtx11extras, - qttools, + qt5, + libsForQt5, taglib_1, fftw, glew, - qjson, sqlite, libgpod, libplist, @@ -26,12 +23,9 @@ pcre, projectm_3, protobuf, - qca-qt5, pkg-config, sparsehash, config, - wrapQtAppsHook, - gst_plugins, util-linuxMinimal, libunwind, libselinux, @@ -46,6 +40,13 @@ let withMTP = config.clementine.mtp or true; withCD = config.clementine.cd or true; withCloud = config.clementine.cloud or true; + + gst_plugins = with gst_all_1; [ + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-libav + ]; in stdenv.mkDerivation (finalAttrs: { pname = "clementine"; @@ -61,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - wrapQtAppsHook + qt5.wrapQtAppsHook util-linuxMinimal libunwind libselinux @@ -80,16 +81,16 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gstreamer gvfs - liblastfm + libsForQt5.liblastfm libpulseaudio pcre projectm_3 protobuf - qca-qt5 - qjson - qtbase - qtx11extras - qttools + libsForQt5.qca-qt5 + libsForQt5.qjson + qt5.qtbase + qt5.qtx11extras + qt5.qttools sqlite taglib_1 alsa-lib diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312d732b0ba0..e057d28d0053 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1924,16 +1924,6 @@ with pkgs; ceph-client = ceph.client; ceph-dev = ceph; - clementine = libsForQt5.callPackage ../applications/audio/clementine { - gst_plugins = with gst_all_1; [ - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-libav - ]; - protobuf = protobuf_21; - }; - inherit (callPackage ../applications/networking/remote/citrix-workspace { }) citrix_workspace_26_01_0 citrix_workspace_25_08_10