diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index b83b8b91c67..e9eea6a2cae 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -114,10 +114,12 @@ in {
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
         type = types.attrsOf types.package;
-        default = { inherit networkmanager modemmanager wpa_supplicant
+        default = { inherit modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect
-                            networkmanager_pptp networkmanager_l2tp; };
+                            networkmanager_pptp networkmanager_l2tp;
+                    networkmanager = networkmanager.out;
+                  };
         internal = true;
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 56b45609a2c..2e9183da970 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -105,12 +105,6 @@ in
 
         pkgs.phonon-backend-gstreamer
         pkgs.kde5.phonon-backend-gstreamer
-        pkgs.gst_all_1.gstreamer
-        pkgs.gst_all_1.gst-plugins-base
-        pkgs.gst_all_1.gst-plugins-good
-        pkgs.gst_all_1.gst-plugins-ugly
-        pkgs.gst_all_1.gst-plugins-bad
-        pkgs.gst_all_1.gst-libav # for mp3 playback
       ]
 
       # Plasma 5.5 and later has a Breeze GTK theme.
@@ -138,14 +132,23 @@ in
       target = "X11/xkb";
     };
 
-    environment.profileRelativeEnvVars = {
-      GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
-    };
-
     # Enable GTK applications to load SVG icons
-    environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-    };
+    environment.variables =
+      {
+        GST_PLUGIN_SYSTEM_PATH_1_0 =
+          lib.makeSearchPath "/lib/gstreamer-1.0"
+          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav # for mp3 playback
+          ]));
+      }
+      // (if (lib.hasAttr "breeze-icons" kde5)
+          then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
+          else { });
 
     fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
 
diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index db51a5f8962..30f92e4e054 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
   buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 754a3ce68f6..27233f4993c 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+
+  outputs = [ "dev" "out" ];
+
   preBuild = ''
     sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+  preFixup = ''
+    moveToOutput "bin/orbit2-config" "$dev"
+  '';
 
   meta = with stdenv.lib; {
     homepage    = https://projects.gnome.org/ORBit2/;
-    description = "A a CORBA 2.4-compliant Object Request Broker";
+    description = "A CORBA 2.4-compliant Object Request Broker";
     platforms   = platforms.unix;
     maintainers = with maintainers; [ lovek323 ];
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 69223393060..340c14e914f 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs =
     [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
       intltool gnome_mime_data avahi acl
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index add013e64cd..af1960af36a 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
   };
 
+  outputs = [ "dev" "out" ];
+
   preConfigure = # still using stuff deprecated in new glib versions
     "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";
 
diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index 5e5bae4d181..ce1da95762f 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation {
   name = "libglade-2.6.4";
-  
+
   src = fetchurl {
     url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2;
     sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
   };
-  
+
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ pkgconfig gtk python gettext ];
 
   propagatedBuildInputs = [ libxml2 ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 4612e6aee6f..d0a4d1787c6 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
   };
 
+  outputs = [ "dev" "out" ];
+
   patches = [ ./new-glib.patch ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 8c12754f112..5b5e7af5431 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ libglade ];
   nativeBuildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libart_lgpl gtk ];
diff --git a/pkgs/desktops/kde-5/applications-16.04/ark.nix b/pkgs/desktops/kde-5/applications-16.04/ark.nix
index 9e6f414db9e..331c8c647ca 100644
--- a/pkgs/desktops/kde-5/applications-16.04/ark.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ark.nix
@@ -31,21 +31,9 @@ kdeApp {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    karchive
-    kconfig
-    kcrash
-    kdbusaddons
-    kiconthemes
-    kservice
-    kpty
-    kwidgetsaddons
-    libarchive
-  ];
   propagatedBuildInputs = [
-    khtml
-    ki18n
-    kio
+    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
+    kpty kwidgetsaddons libarchive
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/ark" \
diff --git a/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
index a24928160df..fc91c92dbe6 100644
--- a/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
@@ -13,23 +13,15 @@
 
 kdeApp {
   name = "baloo-widgets";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kservice
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-  ];
   meta = {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
index 72a08c73261..962dd2ba720 100644
--- a/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
@@ -11,21 +11,15 @@
 
 kdeApp {
   name = "dolphin-plugins";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kxmlgui
-    dolphin
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kio
-  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kio kxmlgui dolphin
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/dolphin.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
index 3218146f510..168854383fa 100644
--- a/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
@@ -29,42 +29,22 @@
 
 kdeApp {
   name = "dolphin";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kinit
-    kcmutils
-    kcoreaddons
-    knewstuff
-    kdbusaddons
-    kbookmarks
-    kconfig
-    kparts
-    solid
-    kiconthemes
-    kcompletion
-    knotifications
-    phonon
-    baloo-widgets
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-    ktexteditor
+    kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts
+    solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo
+    kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor
     kwindowsystem
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/dolphin"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
index 53e9d807d64..feacf7e437e 100644
--- a/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
@@ -7,15 +7,15 @@
 
 kdeApp {
   name = "ffmpegthumbs";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    ffmpeg
-    kio
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    ffmpeg
+    kio
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/filelight.nix b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
index df5e097a540..5ac101fa501 100644
--- a/pkgs/desktops/kde-5/applications-16.04/filelight.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
@@ -12,24 +12,19 @@
 
 kdeApp {
   name = "filelight";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kio
-    kparts
-    qtscript
-    solid
-    kxmlgui
+  propagatedBuildInputs = [
+    kio kparts qtscript solid kxmlgui
   ];
-
   postInstall = ''
     wrapQtProgram "$out/bin/filelight"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ fridh vcunat ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
index ac14573dcaa..8d6f11879d3 100644
--- a/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
@@ -7,15 +7,14 @@
 
 kdeApp {
   name = "gpgmepp";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    boost
-    gpgme
-  ];
   meta = {
     license = with lib.licenses; [ lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    boost gpgme
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/gwenview.nix b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
index 732ac11e96d..20fc554d01a 100644
--- a/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
@@ -16,29 +16,19 @@
 
 kdeApp {
   name = "gwenview";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    exiv2
-    lcms2
-    phonon
-    qtsvg
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kio
-    qtx11extras
+    baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/gwenview"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kate.nix b/pkgs/desktops/kde-5/applications-16.04/kate.nix
index 91eeb2314a4..e368483771f 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kate.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kate.nix
@@ -28,42 +28,22 @@
 
 kdeApp {
   name = "kate";
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    qtscript
-    kconfig
-    kcrash
-    kguiaddons
-    kiconthemes
-    kinit
-    kjobwidgets
-    kparts
-    kxmlgui
-    kdbusaddons
-    kwallet
-    kitemmodels
-    knotifications
-    threadweaver
-    knewstuff
-    libgit2
-  ];
   propagatedBuildInputs = [
-    kactivities
-    ki18n
-    kio
-    ktexteditor
-    kwindowsystem
-    plasma-framework
+    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript
+    kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui
+    kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff
+    libgit2
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kate"
     wrapQtProgram "$out/bin/kwrite"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kcalc.nix b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
index e4c8e9d6925..ce9cf46d489 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
@@ -13,27 +13,18 @@
 
 kdeApp {
   name = "kcalc";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    gmp
-    kconfig
-    kconfigwidgets
-    kguiaddons
-    kinit
-    knotifications
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcalc"
-  '';
-
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    gmp kconfig kconfigwidgets kguiaddons kinit knotifications
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcalc"
+  '';
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
index 0f8e8fbee82..8726f6870ca 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
@@ -5,12 +5,10 @@
 
 kdeApp {
   name = "kcolorchooser";
-
   meta = {
     license = with lib.licenses; [ mit ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
index 520bad0d066..cddf064e47b 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
@@ -8,16 +8,14 @@
 
 kdeApp {
   name = "kdegraphics-thumbnailers";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kio
-    libkexiv2
-    libkdcraw
-  ];
   meta = {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kio libkexiv2 libkdcraw
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
index 4e99a43b391..2190ab8ea64 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
@@ -11,19 +11,15 @@
 
 kdeApp {
   name = "kdenetwork-filesharing";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kio
-    kwidgetsaddons
-    samba
-  ];
   meta = {
     license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kio kwidgetsaddons samba
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
index 9de84913a25..9d28066cae9 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
@@ -33,7 +33,7 @@ kdeApp {
     extra-cmake-modules kdoctools
     shared_mime_info
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
     kpty libmtp libssh openexr openslp phonon qtsvg samba solid
diff --git a/pkgs/desktops/kde-5/applications-16.04/konsole.nix b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
index 4b4cba2a377..2042611f61b 100644
--- a/pkgs/desktops/kde-5/applications-16.04/konsole.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
@@ -28,41 +28,19 @@
 
 kdeApp {
   name = "konsole";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    qtscript
-    kbookmarks
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kguiaddons
-    kiconthemes
-    kinit
-    kio
-    knotifications
-    knotifyconfig
-    kparts
-    kpty
-    kservice
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kwindowsystem
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/konsole"
-  '';
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools makeQtWrapper
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig
+    kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications
+    knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kxmlgui
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/konsole"
+  '';
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
index 319c7fc6583..1c1ef7dc996 100644
--- a/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
@@ -6,14 +6,14 @@
 
 kdeApp {
   name = "libkdcraw";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libraw
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    libraw
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
index afb1ac83653..5a46912a109 100644
--- a/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
@@ -6,14 +6,14 @@
 
 kdeApp {
   name = "libkexiv2";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    exiv2
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    exiv2
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/libkipi.nix b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
index c23cd8578fb..33903463714 100644
--- a/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
@@ -9,14 +9,14 @@
 
 kdeApp {
   name = "libkipi";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kconfig ki18n kservice kxmlgui
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kconfig ki18n kservice kxmlgui
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/print-manager.nix b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
index b4eab372789..cf0703b7d2c 100644
--- a/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
@@ -19,29 +19,16 @@
 
 kdeApp {
   name = "print-manager";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    cups
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kcmutils
-    knotifications
-    kwidgetsaddons
-    kitemviews
-  ];
-  propagatedBuildInputs = [
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
-  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+    kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
+    qtdeclarative
+  ];
 }
diff --git a/pkgs/desktops/kde-5/applications-16.04/spectacle.nix b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
index dc2fb708b53..7e324f2b3fc 100644
--- a/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
@@ -19,17 +19,17 @@
 
 kdeApp {
   name = "spectacle";
+  meta = with lib; {
+    maintainers = with maintainers; [ ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules kdoctools makeQtWrapper
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
   ];
   postFixup = ''
     wrapQtProgram "$out/bin/spectacle"
   '';
-  meta = with lib; {
-    maintainers = with maintainers; [ ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
index 38c41d9271d..a4fdf9bb665 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
@@ -6,11 +6,9 @@
 kdeFramework {
   name = "baloo";
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
   propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
+    kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
+    kidletime lmdb qtbase qtquick1 solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/baloo_file"
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
index f981b0516f7..26490167dbd 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "bluez-qt";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtdeclarative ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
       --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
index 44cc99daf26..773261638c9 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
@@ -5,6 +5,7 @@
 
 kdeFramework {
   name = "breeze-icons";
+  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ qtsvg ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
index e88538a78b3..f7c43f73e9f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
@@ -112,7 +112,7 @@ let
     modemmanager-qt = callPackage ./modemmanager-qt.nix {};
     networkmanager-qt = callPackage ./networkmanager-qt.nix {};
     oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
+    plasma-framework = callPackage ./plasma-framework.nix {};
     solid = callPackage ./solid.nix {};
     sonnet = callPackage ./sonnet.nix {};
     threadweaver = callPackage ./threadweaver.nix {};
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
index 193cb048949..49ac5d0c8b5 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
@@ -10,12 +10,7 @@ _ecmPropagateSharedData() {
         "kconf_update" \
         "kservices5" \
         "kservicetypes5" \
-        "kxmlgui5" \
         "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
         "applications" \
         "desktop-directories" \
         "mime" \
@@ -26,7 +21,6 @@ _ecmPropagateSharedData() {
     for dir in ${sharedPaths[@]}; do
         if [ -d "$1/share/$dir" ]; then
             addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedBuildInputs "$1"
             propagateOnce propagatedUserEnvPkgs "$1"
             break
         fi
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
index 26987c385ad..ee1b188d407 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
@@ -5,13 +5,10 @@
 
 kdeFramework {
   name = "frameworkintegration";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio
+    kiconthemes kwidgetsaddons libXcursor qtx11extras
   ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
index c8405ce31b0..0080c5c3164 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
@@ -5,5 +5,5 @@ kdeFramework {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ boost kactivities kconfig ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
index 7c01073e078..167c3f15bbd 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
@@ -5,15 +5,10 @@
 
 kdeFramework {
   name = "kactivities";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
   propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
+    boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
+    ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
index 647be8f052c..f78a5ea08a4 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
@@ -5,8 +5,6 @@
 
 kdeFramework {
   name = "kapidox";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
index a8d9a0003c3..bec44a6d687 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "karchive";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
index 1352d8c5821..4bdba88bc3b 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
@@ -6,11 +6,8 @@
 
 kdeFramework {
   name = "kauth";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kcoreaddons polkit-qt ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
index 1a469ab4db6..7348e591d9c 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
@@ -10,16 +10,9 @@
 
 kdeFramework {
   name = "kbookmarks";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
+  propagatedBuildInputs = [
+    kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
index dbbb783ac61..fdf55174548 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
@@ -5,13 +5,11 @@
 
 kdeFramework {
   name = "kcmutils";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
+  propagatedBuildInputs = [
+    kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
+    kpackage kservice kxmlgui
   ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
index e393774f16a..8c45bed2585 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
@@ -6,9 +6,7 @@
 
 kdeFramework {
   name = "kcompletion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kwidgetsaddons ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
index 3b3bd27cce0..1e6976113de 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
@@ -4,15 +4,12 @@
 
 kdeFramework {
   name = "kconfigwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   postInstall = ''
     moveToOutput "bin/preparetips5" "$dev"
     wrapQtProgram "$dev/bin/preparetips5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
index f3a1db7bd48..846b187c866 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
@@ -5,12 +5,10 @@
 
 kdeFramework {
   name = "kcoreaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
+  propagatedBuildInputs = [ shared_mime_info ];
   postInstall = ''
     wrapQtProgram "$out/bin/desktoptojson"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
index bbab78ccb40..133a81c60c1 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
@@ -7,10 +7,7 @@
 
 kdeFramework {
   name = "kcrash";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
index 74d107466cf..af9a009b82e 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
@@ -6,17 +6,13 @@
 
 kdeFramework {
   name = "kdeclarative";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
   propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
+    epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
+    kwidgetsaddons kwindowsystem qtdeclarative
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kpackagelauncherqml"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
index 47ae2d68c68..fd286accb9f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
@@ -11,9 +11,7 @@
 
 kdeFramework {
   name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
deleted file mode 100644
index e61c4bb86e7..00000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
index 843db83a99b..1765ffa9a39 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
@@ -12,25 +12,20 @@
 
 kdeFramework {
   name = "kdelibs4support";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   outputs = [ "dev" "out" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
   propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
+    kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
+    kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
+    kio kiconthemes kitemmodels kinit knotifications kparts kservice
+    ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
+    networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXML4_DTD_VERSION=4.5"
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
index cbc114ccca0..d6e03e17472 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
@@ -18,17 +18,13 @@
 
 kdeFramework {
   name = "kdesignerplugin";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
+  propagatedBuildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kio
+    kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
   ];
-  propagatedBuildInputs = [ kio sonnet ];
   postInstall = ''
     wrapQtProgram "$out/bin/kgendesignerplugin"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
index 364fbd6a720..fcccea9161f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
@@ -4,10 +4,7 @@
 
 kdeFramework {
   name = "kdesu";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
index d361313d1d4..3c0e4ba3f56 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
@@ -4,10 +4,9 @@
 
 kdeFramework {
   name = "kdewebkit";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet qtwebkit
+  ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
index f00432b0c9c..8fda4e63e3a 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kdnssd";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ avahi ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
index f67c19f4239..0ed249da9a4 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
@@ -4,16 +4,13 @@
 
 kdeFramework {
   name = "kdoctools";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
   ];
   patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
index d165f84e3a2..1e31277172d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
@@ -8,10 +8,7 @@
 
 kdeFramework {
   name = "kemoticons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
deleted file mode 100644
index be99c58d550..00000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
index 9bb4831cf8d..bc7349e7453 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
@@ -4,11 +4,10 @@
 
 kdeFramework {
   name = "kfilemetadata";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
+  ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
index c535b3590a3..79db990f191 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
@@ -11,13 +11,12 @@
 
 kdeFramework {
   name = "kglobalaccel";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras
+  ];
   postInstall = ''
     wrapQtProgram "$out/bin/kglobalaccel5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
index bc4e9ab1184..6ebfd1104f7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kguiaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
index d40df466ebb..99f6fe31e0d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
@@ -6,16 +6,11 @@
 
 kdeFramework {
   name = "khtml";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
   propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
+    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
+    knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
+    kxmlgui phonon qtx11extras sonnet
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
index 268006512e7..2698a97fd33 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
@@ -8,10 +8,8 @@
 
 kdeFramework {
   name = "ki18n";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
+  propagatedBuildInputs = [ qtdeclarative qtscript ];
   propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
index b78b25582be..4e868480636 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
@@ -5,14 +5,11 @@
 
 kdeFramework {
   name = "kiconthemes";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
+  propagatedBuildInputs = [ breeze-icons kconfigwidgets ki18n kitemviews qtsvg ];
   postInstall = ''
     wrapQtProgram "$out/bin/kiconfinder5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
index fc086560023..758260517e7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
@@ -6,10 +6,7 @@
 
 kdeFramework {
   name = "kidletime";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtbase qtx11extras ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
index 49d66bbcc2c..fbc8d092f86 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kimageformats";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
index 64210ca7605..454e3977c3a 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
@@ -3,15 +3,12 @@
 , libcap_progs
 }:
 
-# TODO: setuid wrapper
-
 kdeFramework {
   name = "kinit";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
+  propagatedBuildInputs = [
+    kconfig kcrash ki18n kio kservice kwindowsystem libcap
+  ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
index a2131ff3385..cfa597e9cd1 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
@@ -9,17 +9,15 @@
 
 kdeFramework {
   name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
   propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
+    acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
+    qtx11extras
   ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postInstall = ''
     wrapQtProgram "$out/bin/kcookiejar5"
     wrapQtProgram "$out/bin/ktelnetservice5"
@@ -27,7 +25,4 @@ kdeFramework {
     wrapQtProgram "$out/bin/kmailservice5"
     wrapQtProgram "$out/bin/protocoltojson"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
index a9024d771cc..7dff10b7fe0 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kitemmodels";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
index 931019ce495..77f4b662160 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kitemviews";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
index 746edf12eea..2692458b8be 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
@@ -7,10 +7,7 @@
 
 kdeFramework {
   name = "kjobwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
index 768720f178c..1a8750ea74f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
@@ -6,11 +6,9 @@
 
 kdeFramework {
   name = "kjs";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   postInstall = ''
     wrapQtProgram "$out/bin/kjs5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
index 22eef2d47bd..7611b831007 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
@@ -4,14 +4,11 @@
 
 kdeFramework {
   name = "kjsembed";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
+  propagatedBuildInputs = [ ki18n kjs qtsvg ];
   postInstall = ''
     wrapQtProgram "$out/bin/kjscmd5"
     wrapQtProgram "$out/bin/kjsconsole"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
index 460458b2232..93a6b450f76 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
@@ -6,10 +6,7 @@
 
 kdeFramework {
   name = "kmediaplayer";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kparts kxmlgui ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
index 5bcd6f30146..002418c65ad 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
@@ -5,13 +5,10 @@
 
 kdeFramework {
   name = "knewstuff";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
+  propagatedBuildInputs = [
+    attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
+    kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
   ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
index 791caa02edb..7196832495f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
@@ -8,12 +8,9 @@
 
 kdeFramework {
   name = "knotifications";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons libdbusmenu phonon
+  propagatedBuildInputs = [
+    kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
index dd99d2d4f1e..0e357aecb99 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
@@ -4,10 +4,7 @@
 
 kdeFramework {
   name = "knotifyconfig";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
index aea1b0d31a0..874bb380d73 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
@@ -10,14 +10,11 @@
 
 kdeFramework {
   name = "kpackage";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postInstall = ''
     wrapQtProgram "$out/bin/kpackagetool5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
index 1c3e0b2cbc5..ad6ea2dbc30 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
@@ -5,13 +5,10 @@
 
 kdeFramework {
   name = "kparts";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
+    kservice ktextwidgets kwidgetsaddons kxmlgui
   ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
index 4c3877e7efd..6acb5e2eed5 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
@@ -4,12 +4,9 @@
 
 kdeFramework {
   name = "kpeople";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
index c16f51b5ac3..601f1778db7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kplotting";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
index 2e34e6f674c..8bdaacb85f8 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
@@ -2,9 +2,7 @@
 
 kdeFramework {
   name = "kpty";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
index 7c6f079feaa..0e66d95b5cc 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
@@ -5,10 +5,10 @@
 
 kdeFramework {
   name = "kross";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
+    qtscript
+  ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
index 12d2b54d0eb..f07a0c31c29 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
@@ -5,12 +5,10 @@
 
 kdeFramework {
   name = "krunner";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kio kservice plasma-framework qtquick1 solid
+    threadweaver
   ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2..00000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c6852611..00000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
index 3a27d85b916..484be408794 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
@@ -1,18 +1,12 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcoreaddons
 , kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
 }:
 
 kdeFramework {
   name = "kservice";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   propagatedNativeBuildInputs = [ extra-cmake-modules ];
   nativeBuildInputs = [ kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
new file mode 100644
index 00000000000..e65d4505ed2
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
@@ -0,0 +1,25 @@
+Index: kservice-5.21.0/src/sycoca/ksycocautils.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/ksycocautils.cpp
++++ kservice-5.21.0/src/sycoca/ksycocautils.cpp
+@@ -24,9 +24,10 @@
+ 
+ void KSycocaUtilsPrivate::read(QDataStream &s, QString &str)
+ {
++    const qint32 bufferSize = 65528;
+     quint32 bytes;
+     s >> bytes;                          // read size of string
+-    if (bytes > 8192) {                  // null string or too big
++    if (bytes > bufferSize) {                  // null string or too big
+         if (bytes != 0xffffffff) {
+             KSycoca::flagError();
+         }
+@@ -35,7 +36,7 @@ void KSycocaUtilsPrivate::read(QDataStre
+         int bt = bytes / 2;
+         str.resize(bt);
+         QChar *ch = str.data();
+-        char t[8192];
++        char t[bufferSize];
+         char *b = t;
+         s.readRawData(b, bytes);
+         while (bt--) {
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
new file mode 100644
index 00000000000..cf98ffb9067
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+Index: kservice-5.21.0/src/sycoca/vfolder_menu.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/vfolder_menu.cpp
++++ kservice-5.21.0/src/sycoca/vfolder_menu.cpp
+@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++      QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
new file mode 100644
index 00000000000..cbe13b70950
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
@@ -0,0 +1,13 @@
+Index: kservice-5.21.0/src/sycoca/kbuildsycoca.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/kbuildsycoca.cpp
++++ kservice-5.21.0/src/sycoca/kbuildsycoca.cpp
+@@ -203,7 +203,7 @@ bool KBuildSycoca::build()
+         QSet<QString> relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/series b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series
new file mode 100644
index 00000000000..c1655f68606
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series
@@ -0,0 +1,3 @@
+qdiriterator-follow-symlinks.patch
+no-canonicalize-path.patch
+ksycoca-buffer-size.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
index b8df6a5f4c0..e1a5e8b2339 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
@@ -8,15 +8,11 @@
 
 kdeFramework {
   name = "ktexteditor";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
+  propagatedBuildInputs = [
+    karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
+    qtxmlpatterns sonnet
   ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
index e332d4ff9a8..25954c60397 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
@@ -5,12 +5,10 @@
 
 kdeFramework {
   name = "ktextwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
+  propagatedBuildInputs = [
+    kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
+    sonnet
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
index 3cf0f847d83..c04ded722aa 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
@@ -2,9 +2,7 @@
 
 kdeFramework {
   name = "kunitconversion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
index 5ade5f63a8d..3bb99df39a7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
@@ -5,17 +5,14 @@
 
 kdeFramework {
   name = "kwallet";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    knotifications kservice kwidgetsaddons libgcrypt
+  propagatedBuildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
   postInstall = ''
     wrapQtProgram "$out/bin/kwalletd5"
     wrapQtProgram "$out/bin/kwallet-query"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
index d95f44d3fec..7f2b35d8f7b 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kwidgetsaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
index 09ab1f2200d..6acab52d135 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kwindowsystem";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
index f081d5f9170..ea800bf58ae 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
@@ -5,14 +5,10 @@
 
 kdeFramework {
   name = "kxmlgui";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
   propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
+    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
+    ktextwidgets kwindowsystem sonnet
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
index 20a300b68bc..f20f4a22394 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
@@ -2,9 +2,7 @@
 
 kdeFramework {
   name = "kxmlrpcclient";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
index 7d7f769d6a9..e03254a71ed 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "modemmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
index 333378bd143..0515509a77c 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "networkmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
index ee350f8e153..0b5c75b960d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
@@ -5,9 +5,10 @@
 
 kdeFramework {
   name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
   meta = {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  outputs = [ "out" ];
+  nativeBuildInputs = [ extra-cmake-modules ];
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
similarity index 62%
rename from pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
index d8846f77723..2a8762c814f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
@@ -7,19 +7,14 @@
 
 kdeFramework {
   name = "plasma-framework";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
+    kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
+    kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
+    kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/plasmapkg2"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/solid.nix b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
index afd125e3c59..f1db5c35c10 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
@@ -6,12 +6,10 @@
 
 kdeFramework {
   name = "solid";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtdeclarative ];
   postInstall = ''
     wrapQtProgram "$out/bin/solid-hardware5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
index 943fe04a1c9..28c24302abc 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "sonnet";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
index 52817921cc7..b8f2939e8b5 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
@@ -5,7 +5,5 @@
 kdeFramework {
   name = "threadweaver";
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
index 6596c246202..3bfac828084 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
@@ -9,12 +9,9 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules makeQtWrapper shared_mime_info
   ];
-  buildInputs = [
-    kcoreaddons kdbusaddons kded kiconthemes knotifications
-    kwidgetsaddons
-  ];
   propagatedBuildInputs = [
-    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
+    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
+    kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
   propagatedUserEnvPkgs = [ bluez-qt ];
   postInstall = ''
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
index 63ade168805..f641b48c82b 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
@@ -10,11 +10,9 @@ plasmaPackage {
     extra-cmake-modules
     makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
-  ];
   propagatedBuildInputs = [
     frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
+    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
   postInstall = ''
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index 5270d253164..27274654ce2 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -80,7 +80,7 @@ let
     plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {};
-    plasma-workspace = callPackage ./plasma-workspace.nix {};
+    plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
     polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
     powerdevil = callPackage ./powerdevil.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
index 7f19af6959e..d95db120dec 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
@@ -6,11 +6,9 @@
 plasmaPackage {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcmutils kconfig kdesu kiconthemes
-  ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
+    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu
+    kiconthemes
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kmimetypefinder5"
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
index ab8867520b3..f482f2a6a3f 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
@@ -16,11 +16,10 @@ plasmaPackage {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
+  propagatedBuildInputs = [
+    ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
-  propagatedBuildInputs = [ ki18n kio ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
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 128cfe34d0d..570112e4480 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
@@ -10,12 +10,9 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    ibus kconfig kconfigwidgets kcoreaddons kcmutils
-    knewstuff kservice kunitconversion
-  ];
   propagatedBuildInputs = [
     kdelibs4support kio kross krunner plasma-framework plasma-workspace
-    qtdeclarative qtx11extras
+    qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils
+    knewstuff kservice kunitconversion
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
index 6ba860b9dfb..3ded239b09b 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
@@ -10,10 +10,10 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
+  propagatedBuildInputs = [
+    kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils
+    kservice
   ];
-  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
   postInstall = ''
     wrapQtProgram "$out/bin/khelpcenter"
   '';
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
index 141320e6b3e..1666692c928 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
@@ -6,11 +6,8 @@
 plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcmutils kdbusaddons kxmlgui
-  ];
   propagatedBuildInputs = [
-    kdelibs4support kglobalaccel ki18n kio plasma-framework
-    plasma-workspace qtx11extras
+    kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
+    qtx11extras kcmutils kdbusaddons kxmlgui
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
index ed717790cd0..c6a86fc05f6 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
@@ -12,12 +12,11 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
-    kxmlgui libraw1394 pciutils solid
+  propagatedBuildInputs = [
+    kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig
+    kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice
+    kwidgetsaddons kxmlgui libraw1394 pciutils solid
   ];
-  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
   postInstall = ''
     wrapQtProgram "$out/bin/kinfocenter"
   '';
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
index 3834ca1328f..09224a48716 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
@@ -9,10 +9,9 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kxmlgui kdbusaddons kiconthemes
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
   ];
-  propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
   postInstall = ''
     wrapQtProgram "$out/bin/kmenuedit"
   '';
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
index a521a799362..117a39c3be3 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
@@ -9,19 +9,9 @@ plasmaPackage {
     extra-cmake-modules
     makeQtWrapper
   ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kwidgetsaddons
-    kxmlgui
-  ];
   propagatedBuildInputs = [
-    kglobalaccel
-    ki18n
-    libkscreen
-    qtdeclarative
-    qtgraphicaleffects
+    kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
+    kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kscreen-console"
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
index 562797b546e..2cb3aac0f55 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
@@ -9,11 +9,8 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam wayland
-  ];
   propagatedBuildInputs = [
-    kdeclarative plasma-framework qtdeclarative
+    kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support
+    kglobalaccel kidletime kwayland libXcursor pam wayland
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
index f274512e027..8fe7cecd5a8 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
@@ -5,8 +5,7 @@
 plasmaPackage {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
   postInstall = ''
     wrapQtProgram "$out/bin/ksshaskpass"
   '';
diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
index d47f9215a41..637d539189d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
@@ -10,10 +10,10 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
+    kdelibs4support ki18n
   ];
-  propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
     wrapQtProgram "$out/bin/ksysguardd"
   '';
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
index e4d6eb631f9..3c2788237fc 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
@@ -8,7 +8,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     wayland
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
index a09acb88aad..8c85981de7e 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
@@ -15,15 +15,13 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kcrash kdecoration kiconthemes kidletime kinit knewstuff knotifications
-    kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
-    libSM qtscript udev wayland xcb-util-cursor
-  ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker
-    kwindowsystem plasma-framework qtdeclarative qtmultimedia qtx11extras
+    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
+    plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion
+    kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes
+    kidletime kinit knewstuff knotifications kpackage kservice kwayland
+    kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland
+    xcb-util-cursor
   ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
index a6ed9d9bb28..29498e93404 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
@@ -5,6 +5,5 @@
 plasmaPackage {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
index eddedf969b0..4e04fd5ed1d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
@@ -9,10 +9,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kwayland libXrandr
-  ];
   propagatedBuildInputs = [
-    qtx11extras
+    kwayland libXrandr qtx11extras
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
index 9c352d76156..679ba61e3e2 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
@@ -12,12 +12,9 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kservice
-    kwidgetsaddons qtscript qtwebkit
-  ];
   propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
-    qtx11extras
+    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
+    kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript
+    qtwebkit
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/milou.nix b/pkgs/desktops/kde-5/plasma-5.6/milou.nix
index 760de2d79ab..43f78d9e2a9 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/milou.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/milou.nix
@@ -8,10 +8,8 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    qtscript kcoreaddons kservice
-  ];
   propagatedBuildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative
+    kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
+    kcoreaddons kservice
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
index 02918100408..5a783ca6502 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
@@ -8,11 +8,10 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
-    kservice kcompletion
+  propagatedBuildInputs = [
+    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion
+    frameworkintegration ki18n kwindowsystem qtx11extras
   ];
-  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   postInstall = ''
     wrapQtProgram "$out/bin/oxygen-demo5"
     wrapQtProgram "$out/bin/oxygen-settings5"
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 5f27efc7f24..3475f53e858 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
@@ -17,48 +17,14 @@ plasmaPackage rec {
     kdoctools
     makeQtWrapper
   ];
-  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
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kauth
-    kdeclarative
-    kdelibs4support
-    kemoticons
-    kglobalaccel
-    ki18n
-    kpeople
-    krunner
-    kwin
-    plasma-framework
-    plasma-workspace
-    qtdeclarative
-    qtquick1
-    qtquickcontrols
-    qtx11extras
+    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 qtquick1
+    qtquickcontrols qtx11extras
   ];
   patches = [
     ./0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
index 7088f45d64e..a1e1cf8a127 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
@@ -9,12 +9,8 @@ plasmaPackage rec {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kconfig kcoreaddons kguiaddons kservice
-    qtdeclarative qtmultimedia taglib
-  ];
   propagatedBuildInputs = [
-    baloo kactivities kdeclarative kfilemetadata ki18n kio
-    plasma-framework
+    baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework
+    kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
index 249c6d8aac9..0ea2ab49f55 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
@@ -20,15 +20,12 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
-    kxmlgui mobile_broadband_provider_info modemmanager-qt
-    networkmanager-qt openconnect qca-qt5 solid
-  ];
   propagatedBuildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
-    qtdeclarative
+    qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
+    mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
+    qca-qt5 solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kde5-nm-connection-editor"
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
index ff56d1199b1..1712dab773d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
@@ -9,10 +9,8 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    glib kconfigwidgets kcoreaddons libpulseaudio
-  ];
   propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n plasma-framework
+    glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel
+    ki18n plasma-framework
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
deleted file mode 100644
index 462378aae88..00000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ plasmaPackage, lib
-, extra-cmake-modules, kdoctools
-, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
-, kdelibs4support, 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, wayland
-, libksysguard, kconfig, solid, qtquickcontrols
-}:
-
-plasmaPackage {
-  name = "plasma-workspace";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
-    kjsembed knewstuff knotifyconfig kpackage
-    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
-    libXcursor networkmanager-qt pam phonon qtscript
-    wayland
-  ];
-  propagatedBuildInputs = [
-    baloo kactivities kdeclarative kdelibs4support kglobalaccel
-    kidletime krunner ktexteditor kwin libkscreen libksysguard
-    plasma-framework qtquick1 qtquickcontrols qtx11extras solid
-  ];
-
-  postPatch = ''
-    substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-  '';
-
-  postInstall = ''
-    rm "$out/bin/startkde"
-    rm "$out/bin/startplasmacompositor"
-    rm "$out/lib/libexec/startplasma"
-    rm -r "$out/share/wayland-sessions"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
new file mode 100644
index 00000000000..73a84274642
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
@@ -0,0 +1,57 @@
+{ plasmaPackage, lib, copyPathsToStore
+, extra-cmake-modules, kdoctools
+, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative
+, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime, kjsembed, knewstuff
+, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland
+, kwin, kxmlrpcclient, libdbusmenu, libkscreen, libksysguard, libSM, libXcursor
+, networkmanager-qt, pam, phonon, plasma-framework, qtquick1, qtquickcontrols
+, qtscript, qtx11extras, solid, wayland
+}:
+
+plasmaPackage {
+  name = "plasma-workspace";
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
+    kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff
+    knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
+    kwin kxmlrpcclient libdbusmenu libkscreen libksysguard libSM libXcursor
+    networkmanager-qt pam phonon plasma-framework qtquick1 qtquickcontrols
+    qtscript qtx11extras solid wayland
+  ];
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  postPatch = ''
+    substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
+        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+  '';
+
+  postInstall = ''
+    rm "$out/bin/startkde"
+    rm "$out/bin/startplasmacompositor"
+    rm "$out/lib/libexec/startplasma"
+    rm -r "$out/share/wayland-sessions"
+  '';
+
+  preFixup = ''
+    wrapQtProgram $out/bin/kcheckrunning
+    wrapQtProgram $out/bin/kcminit
+    wrapQtProgram $out/bin/kcminit_startup
+    wrapQtProgram $out/bin/kdostartupconfig5
+    wrapQtProgram $out/bin/klipper
+    wrapQtProgram $out/bin/krunner
+    wrapQtProgram $out/bin/ksmserver
+    wrapQtProgram $out/bin/ksplashqml
+    wrapQtProgram $out/bin/kstartupconfig5
+    wrapQtProgram $out/bin/kuiserver5
+    wrapQtProgram $out/bin/plasmashell
+    wrapQtProgram $out/bin/plasmawindowed
+    wrapQtProgram $out/bin/systemmonitor
+    wrapQtProgram $out/bin/xembedsniproxy
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
new file mode 100644
index 00000000000..7842109669a
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
@@ -0,0 +1,104 @@
+Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml
++++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
+@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1
+ 
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: analogclock
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.plasma.workspace.components 2.0
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batteryItem
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.workspace.components 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ MouseArea {
+     id: root
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ FocusScope {
+     id: dialog
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batterymonitor
+Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml
++++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0
+ import org.kde.kquickcontrolsaddons 2.0
+-import "data.js" as Data
++import "../code/data.js" as Data
+ 
+ Flow {
+     id: lockout
+Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml
++++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
+ 
+ import org.kde.plasma.private.notifications 1.0
+ 
+-import "uiproperties.js" as UiProperties
++import "../code/uiproperties.js" as UiProperties
+ 
+ MouseEventListener {
+     id: notificationsApplet
+Index: plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.6.3.orig/applets/systemtray/package/contents/ui/main.qml
++++ plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ // import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+ import org.kde.private.systemtray 2.0 as SystemTray
+-import "Layout.js" as LayoutManager
++import "../code/Layout.js" as LayoutManager
+ 
+ Item {
+     id: root
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
new file mode 100644
index 00000000000..b9081298bd6
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
@@ -0,0 +1 @@
+qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
new file mode 100644
index 00000000000..eea0ae4c199
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
@@ -0,0 +1,372 @@
+Index: plasma-workspace-5.5.5/startkde/startkde.cmake
+===================================================================
+--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
++++ plasma-workspace-5.5.5/startkde/startkde.cmake
+@@ -1,8 +1,36 @@
+-#!/bin/sh
++#!@bash@
+ #
+ #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+ 
++set -x
++
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger.  Since in Nix the
++# timestamp is always the same, this doesn't work.  So as
++# a workaround, nuke the icon cache on login.  This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf.  A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $HOME/.config/Trolltech.conf ]; then
++    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++fi
++
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kbuildsycoca5@
++
+ if test "x$1" = x--failsafe; then
+     KDE_FAILSAFE=1 # General failsafe flag
+     KWIN_COMPOSE=N # Disable KWin's compositing
+@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-else
+-  qdbus=qdbus
+-fi
+-
+ # Check if a KDE session already is running and whether it's possible to connect to X
+-kcheckrunning
++@kcheckrunning@
+ kcheckrunning_result=$?
+ if test $kcheckrunning_result -eq 0 ; then
+-	echo "KDE seems to be already running on this display."
+-	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
++  echo "KDE seems to be already running on this display."
++  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
+ 	exit 1
+ elif test $kcheckrunning_result -eq 2 ; then
+ 	echo "\$DISPLAY is not set or cannot connect to the X server."
+-        exit 1
++  exit 1
+ fi
+ 
+ # Boot sequence:
+@@ -57,13 +72,8 @@ fi
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+ 
+ # We need to create config folder so we can write startupconfigkeys
+-if [  ${XDG_CONFIG_HOME} ]; then
+-  configDir=$XDG_CONFIG_HOME;
+-else
+-  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+-fi
+-
+-mkdir -p $configDir
++configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
++mkdir -p "$configDir"
+ 
+ #This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+@@ -102,42 +112,10 @@ XftSubPixel=none
+ EOF
+ }
+ 
+-# Make sure the Oxygen font is installed
+-# This is necessary for setups where CMAKE_INSTALL_PREFIX
+-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
+-# $XDG_DATA_HOME for fonts. In this case, we symlink the
+-# Oxygen font under ${XDG_DATA_HOME} and make it known to
+-# fontconfig
+-
+-usr_share="/usr/share"
+-install_share="@KDE_INSTALL_FULL_DATADIR@"
+-
+-if [ ! $install_share = $usr_share ]; then
+-
+-    if [ ${XDG_DATA_HOME} ]; then
+-        fontsDir="${XDG_DATA_HOME}/fonts"
+-    else
+-        fontsDir="${HOME}/.fonts"
+-    fi
+-
+-    test -d $fontsDir || {
+-        mkdir -p $fontsDir
+-    }
+-
+-    oxygenDir=$fontsDir/oxygen
+-    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
+-
+-    # if the oxygen dir doesn't exist, create a symlink to be sure that the
+-    # Oxygen font is available to the user
+-    test -d $oxygenDir || test -d $prefixDir && {
+-        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
+-    }
+-fi
+-
+-kstartupconfig5
++@out@/bin/kstartupconfig5
+ returncode=$?
+ if test $returncode -ne 0; then
+-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+     exit 1
+ fi
+ [ -r $configDir/startupconfig ] && . $configDir/startupconfig
+@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
+     export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
+ fi
+ 
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
++export XCURSOR_PATH
++
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
+ 
+     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+     if test $? -eq 10; then
+@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
+     fi
+ fi
+ 
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+-    xrdb -quiet -merge -nocpp <<EOF
+-Xft.dpi: $kcmfonts_general_forcefontdpi
+-EOF
+-fi
++# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
++# from some users that they're confused and don't know what to do. This is
++# especially necessary on slow machines, where starting KDE takes one or two
++# minutes until anything appears on the screen.
++#
++# If the user has overwritten fonts, the cursor font may be different now
++# so don't move this up.
++#
++@xsetroot@ -cursor_name left_ptr
+ 
+ dl=$DESKTOP_LOCKED
+ unset DESKTOP_LOCKED # Don't want it in the environment
+ 
++# Make sure that D-Bus is running
++# D-Bus autolaunch is broken
++if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
++fi
++if @qdbus@ >/dev/null 2>/dev/null; then
++    : # ok
++else
++    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
++    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    exit 1
++fi
++
+ ksplash_pid=
+ if test -z "$dl"; then
+   # the splashscreen and progress indicator
+   case "$ksplashrc_ksplash_engine" in
+     KSplashQML)
+-      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
++      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+       ;;
+     None)
+       ;;
+@@ -201,8 +199,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
+ 
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
+ usr_fdir=$HOME/.fonts
+ 
+ if test -n "$KDEDIRS"; then
+-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
+   sys_odir=$kdedirs_first/share/fonts/override
+   sys_fdir=$kdedirs_first/share/fonts
+ else
+@@ -245,23 +242,13 @@ fi
+ # add the user's dirs to the font path, as they might simply have been made
+ # read-only by the administrator, for whatever reason.
+ 
+-test -d "$sys_odir" && xset +fp "$sys_odir"
+-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@ +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
+ 
+ # Ask X11 to rebuild its font list.
+-xset fp rehash
+-
+-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+-# from some users that they're confused and don't know what to do. This is
+-# especially necessary on slow machines, where starting KDE takes one or two
+-# minutes until anything appears on the screen.
+-#
+-# If the user has overwritten fonts, the cursor font may be different now
+-# so don't move this up.
+-#
+-xsetroot -cursor_name left_ptr
++@xset@ fp rehash
+ 
+ # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+ if test -n "$GS_LIB" ; then
+@@ -274,26 +261,6 @@ fi
+ 
+ echo 'startkde: Starting up...'  1>&2
+ 
+-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-# /usr/local.
+-if test -z "$XDG_DATA_DIRS"; then
+-    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
+-fi
+-export XDG_DATA_DIRS
+-
+-# Make sure that D-Bus is running
+-if $qdbus >/dev/null 2>/dev/null; then
+-    : # ok
+-else
+-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+-    exit 1
+-fi
+-
+-
+ # Mark that full KDE session is running (e.g. Konqueror preloading works only
+ # with full KDE running). The KDE_FULL_SESSION property can be detected by
+ # any X client connected to the same X session, even if not launched
+@@ -318,11 +285,11 @@ fi
+ #
+ KDE_FULL_SESSION=true
+ export KDE_FULL_SESSION
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+ 
+ KDE_SESSION_VERSION=5
+ export KDE_SESSION_VERSION
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+ 
+ KDE_SESSION_UID=`id -ru`
+ export KDE_SESSION_UID
+@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
+ 
+ # At this point all the environment is ready, let's send it to kwalletd if running
+ if test -n "$PAM_KWALLET_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+ fi
+ # ...and also to kwalletd5
+ if test -n "$PAM_KWALLET5_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
+ fi
+ 
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+@@ -349,18 +316,18 @@ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not sync environment to dbus.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
+   exit 1
+ fi
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
+ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
+   exit 1
+ fi
+ 
+@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=""
+ test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+   # Startup error
+   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+ 
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+ 
+ if test x"$wait_drkonqi"x = x"true"x ; then
+     # wait for remaining drkonqi instances with timeout (in seconds)
+-    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+     wait_drkonqi_counter=0
+-    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
+         sleep 5
+         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+             # ask remaining drkonqis to die in a graceful way
+-            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+-                $qdbus "$address" "/MainApplication" "quit"
++            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
++                @qdbus@ "$address" "/MainApplication" "quit"
+             done
+             break
+         fi
+@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...'  1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+ 
+ # Clean up
+-kdeinit5_shutdown
++@kdeinit5_shutdown@
+ 
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@xprop@ -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@xprop@ -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+ 
+ echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
index 3fc3a441ac3..68bb3a9ef3d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
@@ -17,15 +17,8 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kdbusaddons
-    kwidgetsaddons
-    kcoreaddons
-    kcrash
-    kconfig
-    kiconthemes
-    knotifications
-    polkit-qt
+  propagatedBuildInputs = [
+    kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
+    knotifications kwindowsystem polkit-qt
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
index 475e8878206..8f3b354b947 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
@@ -10,11 +10,9 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kconfig kdbusaddons knotifyconfig solid udev
-  ];
   propagatedBuildInputs = [
-    kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
-    kwayland libkscreen plasma-workspace qtx11extras
+    kconfig kdbusaddons knotifyconfig solid udev kactivities kauth
+    kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
+    plasma-workspace qtx11extras
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36..00000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
index a921e153dbc..47264cf38fd 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
@@ -11,10 +11,11 @@ plasmaPackage {
     makeQtWrapper
   ];
   buildInputs = [
-    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
-    kconfig
   ];
-  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
+  propagatedBuildInputs = [
+    khtml ki18n kio kwindowsystem kitemviews kcmutils kservice kiconthemes
+    kxmlgui kdbusaddons kconfig
+  ];
   postInstall = ''
     wrapQtProgram "$out/bin/systemsettings5"
   '';
diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index 4aadafff844..95de4918668 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation {
     sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
   };
 
+  outputs = [ "dev" "out" ];
+
   propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index ebcdcc2b3ef..bb3458d62dd 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -29,11 +29,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
   configureFlags = with lib;
     [
       "--enable-xpdf-headers"
       "--enable-libcurl"
       "--enable-zlib"
+      "--enable-build-type=release"
     ]
     ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ]
     ++ optional (!utils) "--disable-utils";
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 034e25662ea..9cfc052e730 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -45,7 +45,6 @@ let
       nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-      dontFixLibtool = args.dontFixLibtool or true;
 
       outputs = args.outputs or [ "dev" "out" ];
       setOutputFlags = args.setOutputFlags or false;
diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
index f059c19e03b..aa20779f4ec 100644
--- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
@@ -53,6 +53,17 @@ _qtMultioutModuleDevs() {
     # The destination directory must exist or moveToOutput will do nothing
     mkdir -p "${!outputDev}/share"
     moveToOutput "share/doc" "${!outputDev}"
+
+    # Move libtool archives and qmake project files to $dev/lib
+    if [ "z${!outputLib}" != "z${!outputDev}" ]; then
+        pushd "${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+            while read -r -d $'\0' file; do
+                mkdir -p "${!outputDev}/$(dirname "$file")"
+                mv "${!outputLib}/$file" "${!outputDev}/$file"
+            done
+        popd
+    fi
 }
 
 qmakeConfigurePhase() {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 7d68116d716..2cd129acab1 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -8,7 +8,7 @@
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
 
 , coreutils, bison, flex, gdb, gperf, lndir, ruby
-, python, perl, pkgconfig
+, patchelf, perl, pkgconfig, python
 
 # optional dependencies
 , cups ? null
@@ -19,7 +19,7 @@
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
-, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk
 , decryptSslTraffic ? false
 }:
 
@@ -27,6 +27,9 @@ let
   inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 
+  # Search path for Gtk plugin
+  gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ];
+
   dontInvalidateBacking = fetchurl {
     url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
     name = "qtbug-48321-dont-invalidate-backing-store.patch";
@@ -43,7 +46,7 @@ stdenv.mkDerivation {
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
-  outputs = [ "dev" "out" ];
+  outputs = [ "dev" "out" "gtk" ];
 
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
@@ -51,7 +54,6 @@ stdenv.mkDerivation {
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
     ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
@@ -89,14 +91,6 @@ stdenv.mkDerivation {
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
         --replace "@libX11@" "${libX11.out}"
     ''
-    + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
-      substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk.out}" \
-        --replace "@gnome_vfs@" "${gnome_vfs.out}" \
-        --replace "@libgnomeui@" "${libgnomeui.out}" \
-        --replace "@gconf@" "${GConf.out}"
-    ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
@@ -106,24 +100,12 @@ stdenv.mkDerivation {
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
+
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    _multioutQtDevs() {
-        # We cannot simply set these paths in configureFlags because libQtCore retains
-        # references to the paths it was built with.
-        moveToOutput "bin" "$dev"
-        moveToOutput "include" "$dev"
-        moveToOutput "mkspecs" "$dev"
-
-        # The destination directory must exist or moveToOutput will do nothing
-        mkdir -p "$dev/share"
-        moveToOutput "share/doc" "$dev"
-    }
-    preFixupHooks+=(_multioutQtDevs)
-
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
@@ -230,11 +212,50 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
+  preFixup = ''
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "$dev"
+    moveToOutput "include" "$dev"
+    moveToOutput "mkspecs" "$dev"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "$dev/share"
+    moveToOutput "share/doc" "$dev"
+
+    # Move libtool archives and qmake projects
+    if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+        pushd "''${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+            while read -r file; do
+                mkdir -p "''${!outputDev}/$(dirname "$file")"
+                mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+            done
+        popd
+    fi
+
+    # Move the QGtkStyle plugin to the gtk output
+    mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
+    mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
+    rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake"
+
+    # Set RPATH for QGtkStyle plugin
+    qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so"
+    qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")"
+    qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}"
+    patchelf "$qgtk2" \
+        --add-needed libgtk-x11-2.0.so \
+        --add-needed libgnomeui-2.so \
+        --add-needed libgnomevfs-2.so \
+        --add-needed libgconf-2.so \
+        --set-rpath "$qgtk2_RPATH"
+  '';
+
   postFixup =
     ''
       # Don't retain build-time dependencies like gdb and ruby.