From b214c6b64fde1ef5fc549cb8e0f99884f3ec03f7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 8 Jun 2016 13:51:25 -0500 Subject: [PATCH 1/2] kde5.plasma-desktop: add missing ksysguard dependency --- pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix index ca09e15bc44d53..618e7387e62c36 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix @@ -7,7 +7,7 @@ , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver , libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux -, qtquickcontrols +, qtquickcontrols, ksysguard }: plasmaPackage rec { @@ -17,14 +17,14 @@ plasmaPackage rec { kdoctools makeQtWrapper ]; - propagatedBuildInputs = [ + buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative - qtquickcontrols qtx11extras + qtquickcontrols qtx11extras ksysguard ]; patches = [ ./0001-qt-5.5-QML-import-paths.patch From 8dae2eddcfad999a7f8252e43789b0e78d66e6d1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 8 Jun 2016 14:58:35 -0500 Subject: [PATCH 2/2] kde5.kdeplasma-addons: add missing ksysguard dependency --- .../desktops/kde-5/plasma-5.6/kdeplasma-addons.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix index 570112e448040f..3371e17beaf8e2 100644 --- a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix @@ -1,7 +1,8 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig -, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n -, kio, knewstuff, kross, krunner, kservice, kunitconversion +{ plasmaPackage, extra-cmake-modules, kdoctools +, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n +, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras +, ibus }: plasmaPackage { @@ -11,8 +12,9 @@ plasmaPackage { kdoctools ]; propagatedBuildInputs = [ - kdelibs4support kio kross krunner plasma-framework plasma-workspace - qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kservice kunitconversion + kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff + kross krunner kservice ksysguard kunitconversion plasma-framework + plasma-workspace qtdeclarative qtx11extras + ibus ]; }