diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix
index b8220ce9c1fe..b66d015a3bcb 100644
--- a/pkgs/applications/kde-apps-15.08/kate.nix
+++ b/pkgs/applications/kde-apps-15.08/kate.nix
@@ -44,7 +44,6 @@ kdeApp {
     kxmlgui
     kdbusaddons
     kwallet
-    plasma-framework
     kitemmodels
     knotifications
     threadweaver
@@ -57,6 +56,7 @@ kdeApp {
     kio
     ktexteditor
     kwindowsystem
+    plasma-framework
   ];
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix
index c73094e258ef..b4eab372789d 100644
--- a/pkgs/applications/kde-apps-15.08/print-manager.nix
+++ b/pkgs/applications/kde-apps-15.08/print-manager.nix
@@ -30,7 +30,6 @@ kdeApp {
     kiconthemes
     kcmutils
     knotifications
-    plasma-framework
     kwidgetsaddons
     kitemviews
   ];
@@ -38,6 +37,7 @@ kdeApp {
     ki18n
     kio
     kwindowsystem
+    plasma-framework
     qtdeclarative
   ];
   meta = {
diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
index 7933c4a7d85c..d6a96a3276d7 100644
--- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix
@@ -12,9 +12,10 @@ plasmaPackage {
   ];
   buildInputs = [
     ibus kconfig kconfigwidgets kcoreaddons kcmutils
-    knewstuff kservice kunitconversion plasma-framework
+    knewstuff kservice kunitconversion
   ];
   propagatedBuildInputs = [
-    kdelibs4support kio kross krunner qtdeclarative qtx11extras
+    kdelibs4support kio kross krunner plasma-framework qtdeclarative
+    qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix
index a890ab6ee75b..2f520bc021f4 100644
--- a/pkgs/desktops/plasma-5.4/khotkeys.nix
+++ b/pkgs/desktops/plasma-5.4/khotkeys.nix
@@ -7,8 +7,9 @@ plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kdbusaddons kxmlgui plasma-framework
-    plasma-workspace
+    kcmutils kdbusaddons kxmlgui plasma-workspace
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support kglobalaccel ki18n kio plasma-framework qtx11extras
   ];
-  propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n kio qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix
index 96cc3166ab7a..626859e6e23e 100644
--- a/pkgs/desktops/plasma-5.4/kwin/default.nix
+++ b/pkgs/desktops/plasma-5.4/kwin/default.nix
@@ -17,11 +17,11 @@ plasmaPackage {
     epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
     kcrash kdecoration kiconthemes kinit knewstuff knotifications
     kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
-    libSM plasma-framework qtscript udev wayland xcb-util-cursor
+    libSM qtscript udev wayland xcb-util-cursor
   ];
   propagatedBuildInputs = [
     kactivities kdeclarative kglobalaccel ki18n kio kwindowsystem
-    qtdeclarative qtx11extras
+    plasma-framework qtdeclarative qtx11extras
   ];
   patches = [ ./kwin-import-plugin-follow-symlinks.patch ];
   postInstall = ''
diff --git a/pkgs/desktops/plasma-5.4/libksysguard.nix b/pkgs/desktops/plasma-5.4/libksysguard.nix
index e38c251abeaf..81e59975db2e 100644
--- a/pkgs/desktops/plasma-5.4/libksysguard.nix
+++ b/pkgs/desktops/plasma-5.4/libksysguard.nix
@@ -11,9 +11,10 @@ plasmaPackage {
   ];
   buildInputs = [
     kcompletion kconfigwidgets kcoreaddons kservice
-    kwidgetsaddons plasma-framework qtscript qtwebkit
+    kwidgetsaddons qtscript qtwebkit
   ];
   propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem qtx11extras
+    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
+    qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix
index 71e86e22e89b..760de2d79ab4 100644
--- a/pkgs/desktops/plasma-5.4/milou.nix
+++ b/pkgs/desktops/plasma-5.4/milou.nix
@@ -9,7 +9,9 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtscript kcoreaddons kservice plasma-framework
+    qtscript kcoreaddons kservice
+  ];
+  propagatedBuildInputs = [
+    kdeclarative ki18n krunner plasma-framework qtdeclarative
   ];
-  propagatedBuildInputs = [ kdeclarative ki18n krunner qtdeclarative ];
 }
diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
index 4309957f6280..3a226a6976d7 100644
--- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix
@@ -19,12 +19,12 @@ plasmaPackage {
     attica boost fontconfig kcmutils kdbusaddons kded kitemmodels
     knewstuff knotifications knotifyconfig kwallet kwin
     libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon
-    plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg
+    plasma-workspace qtdeclarative qtx11extras qtsvg
     xf86inputevdev xf86inputsynaptics xkeyboard_config xinput
   ];
   propagatedBuildInputs = [
     baloo kactivities kauth kdeclarative kdelibs4support kemoticons
-    kglobalaccel ki18n kpeople krunner
+    kglobalaccel ki18n kpeople krunner plasma-framework
   ];
   patches = [
     (substituteAll {
diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix
index 9c528aa2de00..40912087b8c8 100644
--- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix
@@ -10,10 +10,11 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kconfig kcoreaddons kguiaddons kservice plasma-framework
+    kconfig kcoreaddons kguiaddons kservice
     qtdeclarative qtmultimedia taglib
   ];
   propagatedBuildInputs = [
     baloo kactivities kdeclarative kfilemetadata ki18n kio
+    plasma-framework
   ];
 }
diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix
index ed4f5aea6834..9f956ca635ef 100644
--- a/pkgs/desktops/plasma-5.4/plasma-nm.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix
@@ -15,13 +15,13 @@ plasmaPackage {
   ];
   buildInputs = [
     kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet
-    kwidgetsaddons kxmlgui
-    mobile_broadband_provider_info modemmanager-qt networkmanager-qt
-    openconnect plasma-framework solid
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
+    kxmlgui mobile_broadband_provider_info modemmanager-qt
+    networkmanager-qt openconnect solid
   ];
   propagatedBuildInputs = [
-    kdeclarative kdelibs4support ki18n kio kwindowsystem qtdeclarative
+    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
+    qtdeclarative
   ];
   postInstall = ''
     wrapKDEProgram "$out/bin/kde5-nm-connection-editor"
diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix
index a8334c2bdcdb..aef6bfeb6799 100644
--- a/pkgs/desktops/plasma-5.4/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix
@@ -9,7 +9,9 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    glib kconfigwidgets kcoreaddons libpulseaudio plasma-framework
+    glib kconfigwidgets kcoreaddons libpulseaudio
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kglobalaccel ki18n plasma-framework
   ];
-  propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n ];
 }
diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
index fe860f2956ff..5c4d6f63ddce 100644
--- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
@@ -20,12 +20,12 @@ plasmaPackage {
     kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
     knotifyconfig kpackage ktextwidgets kwallet
     kwayland kwin kxmlrpcclient libdbusmenu libkscreen libSM
-    libXcursor networkmanager-qt pam phonon plasma-framework qtquick1
+    libXcursor networkmanager-qt pam phonon qtquick1
     qtscript qtx11extras solid wayland
   ];
   propagatedBuildInputs = [
     baloo kactivities kdeclarative kdelibs4support kglobalaccel
-    kidletime krunner ktexteditor libksysguard
+    kidletime krunner ktexteditor libksysguard plasma-framework
   ];
   patches = [ ./0001-startkde-NixOS-patches.patch ];