diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
index 4501dcec7acf..6f469d19c85c 100644
--- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
+++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
@@ -23,10 +23,10 @@ kdeApp {
     ki18n
     kservice
     kfilemetadata
-    kdelibs4support
   ];
   propagatedBuildInputs = [
     baloo
+    kdelibs4support
   ];
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
index 4eeec1c17e5b..5a3dbc2b635c 100644
--- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
+++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
@@ -19,9 +19,11 @@ kdeApp {
     kxmlgui
     ki18n
     kio
-    kdelibs4support
     dolphin
   ];
+  propagatedBuildInputs = [
+    kdelibs4support
+  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix
index e61d322d435b..54657606d928 100644
--- a/pkgs/applications/kde-apps-15.08/dolphin.nix
+++ b/pkgs/applications/kde-apps-15.08/dolphin.nix
@@ -52,11 +52,11 @@ kdeApp {
     phonon
     baloo-widgets
     kfilemetadata
-    kdelibs4support
   ];
   propagatedBuildInputs = [
     baloo
     kactivities
+    kdelibs4support
   ];
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix
index 97cb2dd0502b..b53f78b8084c 100644
--- a/pkgs/applications/kde-apps-15.08/gwenview.nix
+++ b/pkgs/applications/kde-apps-15.08/gwenview.nix
@@ -21,7 +21,6 @@ kdeApp {
   ];
   buildInputs = [
     exiv2
-    kdelibs4support
     kio
     lcms2
     phonon
@@ -30,6 +29,7 @@ kdeApp {
   propagatedBuildInputs = [
     baloo
     kactivities
+    kdelibs4support
     qtx11extras
   ];
   meta = {
diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix
index 05cac334348e..a01e9c9adc87 100644
--- a/pkgs/applications/kde-apps-15.08/konsole.nix
+++ b/pkgs/applications/kde-apps-15.08/konsole.nix
@@ -42,7 +42,6 @@ kdeApp {
     ki18n
     kiconthemes
     kinit
-    kdelibs4support
     kio
     knotifications
     knotifyconfig
@@ -54,6 +53,9 @@ kdeApp {
     kwindowsystem
     kxmlgui
   ];
+  propagatedBuildInputs = [
+    kdelibs4support
+  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix
index ce93bb86b325..045429af21b3 100644
--- a/pkgs/desktops/plasma-5.4/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5.4/kde-cli-tools.nix
@@ -1,31 +1,15 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kcmutils
-, kconfig
-, kdelibs4support
-, kdesu
-, kdoctools
-, ki18n
-, kiconthemes
-, kwindowsystem
-, qtsvg
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
+, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
+, kwindowsystem, qtsvg, qtx11extras
 }:
 
 plasmaPackage {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils
-    kconfig
-    kdelibs4support
-    kdesu
-    ki18n
-    kiconthemes
-    kwindowsystem
-    qtsvg
-    qtx11extras
+    kcmutils kconfig kdesu ki18n kiconthemes kwindowsystem
   ];
+  propagatedBuildInputs = [ kdelibs4support qtsvg qtx11extras ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kmimetypefinder5"
     wrapKDEProgram "$out/bin/ksvgtopng5"
diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
index 3e7058315e57..9328db7ad0b9 100644
--- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
@@ -1,22 +1,7 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, ibus
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kcmutils
-, kdelibs4support
-, ki18n
-, kio
-, knewstuff
-, kross
-, krunner
-, kservice
-, kunitconversion
-, plasma-framework
-, qtdeclarative
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
+, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
+, kio, knewstuff, kross, krunner, kservice, kunitconversion
+, plasma-framework, qtdeclarative, qtx11extras
 }:
 
 plasmaPackage {
@@ -26,21 +11,8 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ibus
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kcmutils
-    kdelibs4support
-    ki18n
-    kio
-    knewstuff
-    kross
-    krunner
-    kservice
-    kunitconversion
-    plasma-framework
-    qtdeclarative
-    qtx11extras
+    ibus kconfig kconfigwidgets kcoreaddons kcmutils ki18n kio
+    knewstuff kross krunner kservice kunitconversion plasma-framework
   ];
+  propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5.4/kgamma5.nix b/pkgs/desktops/plasma-5.4/kgamma5.nix
index 8d954cc145a0..965c33e6eef8 100644
--- a/pkgs/desktops/plasma-5.4/kgamma5.nix
+++ b/pkgs/desktops/plasma-5.4/kgamma5.nix
@@ -1,18 +1,9 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kdelibs4support
+{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
 , qtx11extras
 }:
 
 plasmaPackage {
   name = "kgamma5";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kdelibs4support
-    qtx11extras
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix
index 02c43efd27e8..dc1e73ccdfe2 100644
--- a/pkgs/desktops/plasma-5.4/khotkeys.nix
+++ b/pkgs/desktops/plasma-5.4/khotkeys.nix
@@ -1,16 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kcmutils
-, kdbusaddons
-, kdelibs4support
-, kglobalaccel
-, ki18n
-, kio
-, kxmlgui
-, plasma-framework
-, plasma-workspace
-, qtx11extras
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
+, plasma-framework, plasma-workspace, qtx11extras
 }:
 
 plasmaPackage {
@@ -20,15 +10,8 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcmutils
-    kdbusaddons
-    kdelibs4support
-    kglobalaccel
-    ki18n
-    kio
-    kxmlgui
-    plasma-framework
-    plasma-workspace
-    qtx11extras
+    kcmutils kdbusaddons kglobalaccel ki18n kio kxmlgui
+    plasma-framework plasma-workspace
   ];
+  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix
index 11e7c6af6fd0..b76199ab5219 100644
--- a/pkgs/desktops/plasma-5.4/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix
@@ -12,10 +12,10 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kdelibs4support ki18n kiconthemes kio kpackage
-    kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid
+    kdbusaddons ki18n kiconthemes kio kpackage kservice kwidgetsaddons
+    kxmlgui libraw1394 pciutils solid
   ];
-  propagatedBuildInputs = [ kdeclarative ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kinfocenter"
   '';
diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix
index d5eeb3c35730..b041d8dcedc8 100644
--- a/pkgs/desktops/plasma-5.4/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix
@@ -1,13 +1,5 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, ki18n
-, kxmlgui
-, kdbusaddons
-, kiconthemes
-, kio
-, sonnet
-, kdelibs4support
+{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
+, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
 }:
 
 plasmaPackage {
@@ -17,14 +9,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    ki18n
-    kxmlgui
-    kdbusaddons
-    kiconthemes
-    kio
-    sonnet
-    kdelibs4support
+    ki18n kxmlgui kdbusaddons kiconthemes kio sonnet
   ];
+  propagatedBuildInputs = [ kdelibs4support ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kmenuedit"
   '';
diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix
index 23a7c04cca20..d415e726d02f 100644
--- a/pkgs/desktops/plasma-5.4/ksysguard.nix
+++ b/pkgs/desktops/plasma-5.4/ksysguard.nix
@@ -1,14 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kdoctools
-, kconfig
-, kcoreaddons
-, kdelibs4support
-, ki18n
-, kitemviews
-, knewstuff
-, kiconthemes
-, libksysguard
+{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
+, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
+, kiconthemes, libksysguard
 }:
 
 plasmaPackage {
@@ -18,15 +10,10 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig
-    kcoreaddons
-    kdelibs4support
-    ki18n
-    kitemviews
-    knewstuff
-    kiconthemes
+    kconfig kcoreaddons ki18n kitemviews knewstuff kiconthemes
     libksysguard
   ];
+  propagatedBuildInputs = [ kdelibs4support ];
   postInstall = ''
     wrapKDEProgram "$out/bin/ksysguardd"
     wrapKDEProgram "$out/bin/ksysguard"
diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
index 9061cef1e87a..489a4a143717 100644
--- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
@@ -16,15 +16,14 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    attica boost fontconfig kcmutils
-    kdbusaddons kded kdelibs4support kemoticons
+    attica boost fontconfig kcmutils kdbusaddons kded kemoticons
     kglobalaccel ki18n kitemmodels knewstuff knotifications
     knotifyconfig kpeople krunner kwallet kwin libcanberra_kde
     libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework
     plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev
     xf86inputsynaptics xkeyboard_config xinput
   ];
-  propagatedBuildInputs = [ baloo kactivities kauth kdeclarative ];
+  propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support ];
   patches = [
     (substituteAll {
       src = ./0001-hwclock.patch;
diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix
index c7ddf6e89efa..e244f586a817 100644
--- a/pkgs/desktops/plasma-5.4/plasma-nm.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix
@@ -14,13 +14,13 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
-    ki18n kiconthemes kinit kio kitemviews knotifications kservice
-    kwallet kwidgetsaddons kwindowsystem kxmlgui
+    kcompletion kconfigwidgets kcoreaddons kdbusaddons ki18n
+    kiconthemes kinit kio kitemviews knotifications kservice kwallet
+    kwidgetsaddons kwindowsystem kxmlgui
     mobile_broadband_provider_info modemmanager-qt networkmanager-qt
-    openconnect plasma-framework qtdeclarative solid
+    openconnect plasma-framework solid
   ];
-  propagatedBuildInputs = [ kdeclarative ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support qtdeclarative ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
   '';
diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
index b1e2010da319..a2ac1b69f01a 100644
--- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
@@ -18,14 +18,14 @@ plasmaPackage {
   ];
   buildInputs = [
     kcmutils kcrash kdbusaddons
-    kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed
+    kdesu kdewebkit kglobalaccel kidletime kjsembed
     knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets
     kwallet kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM
     libXcursor networkmanager-qt pam phonon plasma-framework qtquick1
     qtscript qtx11extras solid wayland
   ];
   propagatedBuildInputs = [
-    baloo kactivities kdeclarative libksysguard
+    baloo kactivities kdeclarative kdelibs4support libksysguard
   ];
   patches = [ ./0001-startkde-NixOS-patches.patch ];
 
diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix
index 2d3a5521e7da..239b1c77318d 100644
--- a/pkgs/desktops/plasma-5.4/powerdevil.nix
+++ b/pkgs/desktops/plasma-5.4/powerdevil.nix
@@ -11,9 +11,9 @@ plasmaPackage {
     kdoctools
   ];
   buildInputs = [
-    kconfig kdbusaddons kdelibs4support kglobalaccel ki18n
+    kconfig kdbusaddons kglobalaccel ki18n
     kidletime kio knotifyconfig libkscreen plasma-workspace
     qtx11extras solid udev
   ];
-  propagatedBuildInputs = [ kactivities kauth ];
+  propagatedBuildInputs = [ kactivities kauth kdelibs4support ];
 }