Merge branch 'plasma-workspace'

NixOS · Jun 8, 2016 · bdb8baf · bdb8baf
2 parents ba09675 + 8dae2ed
commit bdb8baf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 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
@@ -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
   ];
 }
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
@@ -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