Merge branch 'plasma'

pkgs/desktops/kde-5/plasma/kmenuedit.nix

@@ -1,11 +1,14 @@
-{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui
+{
-, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
+  plasmaPackage,
+  ecm, kdoctools,
+  kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
+  sonnet
 }:
 
 plasmaPackage {
   name = "kmenuedit";
   nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
+    kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet
   ];
 }

pkgs/desktops/kde-5/plasma/ksysguard.nix

@@ -1,11 +1,15 @@
-{ plasmaPackage, ecm, kdoctools, kconfig
+{
-, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
+  plasmaPackage,
-, kiconthemes, libksysguard, qtwebkit
+  ecm, kdoctools,
+  lm_sensors,
+  kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
+  knewstuff, libksysguard, lm_sensors, qtwebkit
 }:
 
 plasmaPackage {
   name = "ksysguard";
   nativeBuildInputs = [ ecm kdoctools ];
+  buildInputs = [ lm_sensors ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
     kdelibs4support ki18n qtwebkit

pkgs/desktops/kde-5/plasma/libksysguard/default.nix

@@ -1,7 +1,9 @@
-{ fetchpatch, plasmaPackage, ecm, kauth, kcompletion
+{
-, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
+  plasmaPackage,
-, kwindowsystem, plasma-framework, qtscript, qtx11extras
+  ecm,
-, kconfig, ki18n, kiconthemes
+  kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
+  kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
+  qtx11extras
 }:
 
 plasmaPackage {
@@ -9,11 +11,10 @@ plasmaPackage {
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
   ];
-  nativeBuildInputs = [
+  nativeBuildInputs = [ ecm ];
-    ecm
-  ];
   propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
+    kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
-    kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript
+    kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
+    qtwebkit
   ];
 }

pkgs/desktops/kde-5/plasma/oxygen.nix

@@ -1,16 +1,16 @@
-{ plasmaPackage, ecm, ki18n, kcmutils, kconfig
+{
-, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
+  plasmaPackage,
-, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
+  ecm, makeQtWrapper,
+  frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
+  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
 
 plasmaPackage {
   name = "oxygen";
-  nativeBuildInputs = [
+  nativeBuildInputs = [ ecm makeQtWrapper ];
-    ecm makeQtWrapper
-  ];
   propagatedBuildInputs = [
-    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion
+    frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-    frameworkintegration ki18n kwindowsystem qtx11extras
+    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/oxygen-demo5"

pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix

@@ -1,20 +1,20 @@
-{ plasmaPackage, substituteAll, ecm, kdoctools
+{
-, attica, baloo, boost, fontconfig, kactivities, kactivities-stats
+  plasmaPackage, substituteAll,
-, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
+  ecm, kdoctools,
-, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
+  attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
-, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
+  kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
-, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
+  kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
-, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
+  kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
-, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
+  libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
-, libcanberra_kde, libpulseaudio, utillinux
+  plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, xf86inputevdev,
-, qtquickcontrols, ksysguard
+  xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, utillinux
 }:
 
 plasmaPackage rec {
   name = "plasma-desktop";
   nativeBuildInputs = [ ecm kdoctools ];
   buildInputs = [
-    attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
+    attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff
     knotifications knotifyconfig kwallet libcanberra_kde libXcursor
     libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
     xf86inputsynaptics xkeyboard_config xinput baloo kactivities

pkgs/development/libraries/kde-frameworks/kimageformats.nix

@@ -1,11 +1,14 @@
-{ kdeFramework, lib
+{
-, ecm
+  kdeFramework, lib,
-, ilmbase
+  ecm,
+  ilmbase, karchive
 }:
 
 kdeFramework {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ ecm ];
+  buildInputs = [ ilmbase ];
+  propagatedBuildInputs = [ karchive ];
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 }