diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/by-name/kc/kcollectd/package.nix similarity index 60% rename from pkgs/tools/misc/kcollectd/default.nix rename to pkgs/by-name/kc/kcollectd/package.nix index a730185d2e4d..edcfc716e802 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/by-name/kc/kcollectd/package.nix @@ -2,29 +2,20 @@ lib, fetchFromGitLab, stdenv, - wrapQtAppsHook, - qtbase, cmake, - kconfig, - kio, - kiconthemes, - kxmlgui, - ki18n, - kguiaddons, - extra-cmake-modules, boost, shared-mime-info, rrdtool, - breeze-icons, + kdePackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kcollectd"; version = "0.12.2"; src = fetchFromGitLab { owner = "aerusso"; - repo = pname; - rev = "v${version}"; + repo = "kcollectd"; + tag = "v${finalAttrs.version}"; hash = "sha256-35zb5Kx0tRP5l0hILdomCu2YSQfng02mbyyAClm4uZs="; }; @@ -32,26 +23,31 @@ stdenv.mkDerivation rec { substituteInPlace kcollectd/rrd_interface.cc --replace-fail 'char *arg[] =' 'const char *arg[] =' ''; - nativeBuildInputs = [ - wrapQtAppsHook - cmake - extra-cmake-modules - shared-mime-info - ]; + nativeBuildInputs = + [ + shared-mime-info + cmake + ] + ++ (with kdePackages; [ + wrapQtAppsHook + extra-cmake-modules + ]); - buildInputs = [ - qtbase - kconfig - kio - kxmlgui - kiconthemes - ki18n - kguiaddons - boost - rrdtool - # otherwise some buttons are blank - breeze-icons - ]; + buildInputs = + [ + boost + rrdtool + ] + ++ (with kdePackages; [ + qtbase + kconfig + kio + kxmlgui + kiconthemes + ki18n + kguiaddons + breeze-icons + ]); meta = with lib; { description = "Graphical frontend to collectd"; @@ -61,4 +57,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; mainProgram = "kcollectd"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9b1e511533c..2ba325d0030a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3580,8 +3580,6 @@ with pkgs; node2nix = nodePackages.node2nix; - kcollectd = kdePackages.callPackage ../tools/misc/kcollectd { }; - ktailctl = kdePackages.callPackage ../applications/networking/ktailctl { }; ldapdomaindump = with python3Packages; toPythonApplication ldapdomaindump;