Merge remote-tracking branch 'upstream/master' into hardened-stdenv

36 files changed, 273 insertions, 379 deletions

diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/kde-5/plasma/bluedevil.nix
index 3bfac828084d..1deef241a62f 100644
--- a/pkgs/desktops/kde-5/plasma/bluedevil.nix
+++ b/pkgs/desktops/kde-5/plasma/bluedevil.nix
@@ -1,22 +1,18 @@
-{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
-, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
-, qtdeclarative, shared_mime_info
+{
+  plasmaPackage, ecm, shared_mime_info,
+  bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
+  knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
 }:
 
 plasmaPackage {
   name = "bluedevil";
-  nativeBuildInputs = [
-    extra-cmake-modules makeQtWrapper shared_mime_info
-  ];
+  nativeBuildInputs = [ ecm shared_mime_info ];
   propagatedBuildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
-  propagatedUserEnvPkgs = [ bluez-qt ];
+  propagatedUserEnvPkgs = [ bluez-qt.out ];
   postInstall = ''
-    wrapQtProgram "$out/bin/bluedevil-wizard"
-    wrapQtProgram "$out/bin/bluedevil-sendfile"
     # Fix the location of logic.js for the plasmoid
     ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
   '';
diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix
index 179f15dc8763..664387de1707 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix
+++ b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix
@@ -1,8 +1,8 @@
 { plasmaPackage
-, extra-cmake-modules
+, ecm
 }:
 
 plasmaPackage {
   name = "breeze-gtk";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
index f8092bc9d376..ad98a41e81dd 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
+++ b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
@@ -1,27 +1,22 @@
-{ plasmaPackage
-, automoc4
-, cmake
-, perl
-, pkgconfig
-, kdelibs
-, qt4
-, xproto
+{
+  stdenv, lib, src, version,
+  automoc4, cmake, perl, pkgconfig,
+  kdelibs, qt4, xproto
 }:
 
-plasmaPackage {
-  name = "breeze-qt4";
-  sname = "breeze";
-  buildInputs = [
-    kdelibs
-    qt4
-    xproto
-  ];
-  nativeBuildInputs = [
-    automoc4
-    cmake
-    perl
-    pkgconfig
-  ];
+stdenv.mkDerivation {
+  name = "breeze-qt4-${version}";
+  meta = {
+    license = with lib.licenses; [
+      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
+    homepage = "http://www.kde.org";
+  };
+  inherit src;
+  buildInputs = [ kdelibs qt4 xproto ];
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
   cmakeFlags = [
     "-DUSE_KDE4=ON"
     "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
index f641b48c82bc..a909e5067f42 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
+++ b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, frameworkintegration
+{ plasmaPackage, ecm, frameworkintegration
 , kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
 , ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras
 }:
@@ -7,7 +7,7 @@ plasmaPackage {
   name = "breeze-qt5";
   sname = "breeze";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
     makeQtWrapper
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index f6bbd5c3f51e..7aff229b4c12 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -13,7 +13,7 @@
 
 let
 
-  inherit (pkgs) lib stdenv symlinkJoin;
+  inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
 
   mirror = "mirror://kde";
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
@@ -24,17 +24,10 @@ let
         inherit (args) name;
         sname = args.sname or name;
         inherit (srcs."${sname}") src version;
-      in stdenv.mkDerivation (args // {
+      in kdeDerivation (args // {
         name = "${name}-${version}";
         inherit src;
 
-        outputs = args.outputs or [ "dev" "out" ];
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
         meta = {
           license = with lib.licenses; [
             lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
@@ -47,7 +40,9 @@ let
 
     bluedevil = callPackage ./bluedevil.nix {};
     breeze-gtk = callPackage ./breeze-gtk.nix {};
-    breeze-qt4 = callPackage ./breeze-qt4.nix {};
+    breeze-qt4 = callPackage ./breeze-qt4.nix {
+      inherit (srcs.breeze) src version;
+    };
     breeze-qt5 = callPackage ./breeze-qt5.nix {};
     breeze =
       let
diff --git a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
index 282e58ecf9e6..bb90fd6d3ab0 100644
--- a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
+++ b/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
@@ -1,12 +1,12 @@
 { plasmaPackage
-, extra-cmake-modules
+, ecm
 , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
 , kwindowsystem, kxmlgui
 }:
 
 plasmaPackage {
   name = "kactivitymanagerd";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
     kxmlgui
diff --git a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
index d95db120dec4..33a7340cb85f 100644
--- a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
+++ b/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
@@ -1,25 +1,14 @@
-{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
-, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
-, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
+{
+  plasmaPackage, ecm,
+  kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
+  kwindowsystem, qtsvg, qtx11extras
 }:
 
 plasmaPackage {
   name = "kde-cli-tools";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu
-    kiconthemes
+    kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
+    qtx11extras
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kmimetypefinder5"
-    wrapQtProgram "$out/bin/ksvgtopng5"
-    wrapQtProgram "$out/bin/ktraderclient5"
-    wrapQtProgram "$out/bin/kioclient5"
-    wrapQtProgram "$out/bin/kdecp5"
-    wrapQtProgram "$out/bin/keditfiletype5"
-    wrapQtProgram "$out/bin/kcmshell5"
-    wrapQtProgram "$out/bin/kdemv5"
-    wrapQtProgram "$out/bin/kstart5"
-    wrapQtProgram "$out/bin/kde-open5"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
index f482f2a6a3f3..10e55f0d6980 100644
--- a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
+++ b/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
@@ -1,5 +1,5 @@
 { plasmaPackage
-, extra-cmake-modules
+, ecm
 , glib
 , gtk2
 , gtk3
@@ -15,7 +15,7 @@
 plasmaPackage {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
diff --git a/pkgs/desktops/kde-5/plasma/kdecoration.nix b/pkgs/desktops/kde-5/plasma/kdecoration.nix
index eb65f7f90afb..a0f9d93e60b0 100644
--- a/pkgs/desktops/kde-5/plasma/kdecoration.nix
+++ b/pkgs/desktops/kde-5/plasma/kdecoration.nix
@@ -1,6 +1,6 @@
-{ plasmaPackage, extra-cmake-modules }:
+{ plasmaPackage, ecm }:
 
 plasmaPackage {
   name = "kdecoration";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
index 3371e17beaf8..a2805f5d804b 100644
--- a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools
+{ plasmaPackage, ecm, kdoctools
 , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
 , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
 , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "kdeplasma-addons";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
     kdoctools
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/kde-5/plasma/kgamma5.nix b/pkgs/desktops/kde-5/plasma/kgamma5.nix
index 965c33e6eef8..70d7cc17a1ca 100644
--- a/pkgs/desktops/kde-5/plasma/kgamma5.nix
+++ b/pkgs/desktops/kde-5/plasma/kgamma5.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
+{ plasmaPackage, ecm, kdoctools, kdelibs4support
 , qtx11extras
 }:
 
 plasmaPackage {
   name = "kgamma5";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [ kdelibs4support qtx11extras ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix
index 1666692c928b..760a2a4ee375 100644
--- a/pkgs/desktops/kde-5/plasma/khotkeys.nix
+++ b/pkgs/desktops/kde-5/plasma/khotkeys.nix
@@ -1,11 +1,11 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+{ plasmaPackage, ecm, kdoctools, kcmutils
 , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
 , plasma-framework, plasma-workspace, qtx11extras
 }:
 
 plasmaPackage {
   name = "khotkeys";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
     qtx11extras kcmutils kdbusaddons kxmlgui
diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/kde-5/plasma/kinfocenter.nix
index c6a86fc05f63..dd9bdbd31bdf 100644
--- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix
+++ b/pkgs/desktops/kde-5/plasma/kinfocenter.nix
@@ -1,23 +1,16 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+{ plasmaPackage, ecm, kdoctools, kcmutils
 , kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
 , kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
-, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper
+, kservice, kwidgetsaddons, kxmlgui, libraw1394
 , pciutils, solid
 }:
 
 plasmaPackage {
   name = "kinfocenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig
     kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice
     kwidgetsaddons kxmlgui libraw1394 pciutils solid
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kinfocenter"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/kde-5/plasma/kmenuedit.nix
index 09224a487167..3adb77a00517 100644
--- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix
+++ b/pkgs/desktops/kde-5/plasma/kmenuedit.nix
@@ -1,18 +1,11 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
-, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
+{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui
+, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support
 }:
 
 plasmaPackage {
   name = "kmenuedit";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kmenuedit"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/kde-5/plasma/kscreen.nix
index 117a39c3be32..ecbd88c2146d 100644
--- a/pkgs/desktops/kde-5/plasma/kscreen.nix
+++ b/pkgs/desktops/kde-5/plasma/kscreen.nix
@@ -1,19 +1,13 @@
-{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
+{ plasmaPackage, ecm, kconfig, kconfigwidgets
 , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects
+, libkscreen, qtdeclarative, qtgraphicaleffects
 }:
 
 plasmaPackage {
   name = "kscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
     kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kscreen-console"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
index 2cb3aac0f559..8fb5d9e708bc 100644
--- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
+++ b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
@@ -1,14 +1,11 @@
-{ plasmaPackage, extra-cmake-modules, kcmutils, kcrash, kdeclarative
+{ plasmaPackage, ecm, kcmutils, kcrash, kdeclarative
 , kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland
 , libXcursor, pam, plasma-framework, qtdeclarative, wayland
 }:
 
 plasmaPackage {
   name = "kscreenlocker";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support
     kglobalaccel kidletime kwayland libXcursor pam wayland
diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix
index 8fe7cecd5a80..80b529a66685 100644
--- a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix
+++ b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix
@@ -1,12 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
-, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
+{ plasmaPackage, ecm, kdoctools, kcoreaddons
+, ki18n, kwallet, kwidgetsaddons
 }:
 
 plasmaPackage {
   name = "ksshaskpass";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/ksshaskpass"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix
index 637d539189d5..b0e94c6a5958 100644
--- a/pkgs/desktops/kde-5/plasma/ksysguard.nix
+++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix
@@ -1,20 +1,13 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
+{ plasmaPackage, ecm, kdoctools, kconfig
 , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
-, kiconthemes, libksysguard, makeQtWrapper
+, kiconthemes, libksysguard
 }:
 
 plasmaPackage {
   name = "ksysguard";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
     kdelibs4support ki18n
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/ksysguardd"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix b/pkgs/desktops/kde-5/plasma/kwayland-integration.nix
index 9045227a51a9..376e8ed7cbda 100644
--- a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix
+++ b/pkgs/desktops/kde-5/plasma/kwayland-integration.nix
@@ -1,5 +1,5 @@
 { plasmaPackage
-, extra-cmake-modules
+, ecm
 , kidletime
 , kwayland
 , kwindowsystem
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "kwayland-integration";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   propagatedBuildInputs = [
     kidletime kwindowsystem kwayland
diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix
index 8c85981de7e8..d121ba84dd00 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/default.nix
+++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
+{ plasmaPackage, ecm, kdoctools, epoxy
 , kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
 , kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
 , ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications
@@ -11,9 +11,8 @@
 plasmaPackage {
   name = "kwin";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
     kdoctools
-    makeQtWrapper
   ];
   propagatedBuildInputs = [
     kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
@@ -25,8 +24,4 @@ plasmaPackage {
   ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwin_x11"
-    wrapQtProgram "$out/bin/kwin_wayland"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/kde-5/plasma/kwrited.nix
index 29498e93404d..8dd814f783d0 100644
--- a/pkgs/desktops/kde-5/plasma/kwrited.nix
+++ b/pkgs/desktops/kde-5/plasma/kwrited.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{ plasmaPackage, ecm, kcoreaddons, ki18n, kpty
 , knotifications, kdbusaddons
 }:
 
 plasmaPackage {
   name = "kwrited";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/libkscreen.nix b/pkgs/desktops/kde-5/plasma/libkscreen.nix
index 4e04fd5ed1d9..838ab6ef0e5c 100644
--- a/pkgs/desktops/kde-5/plasma/libkscreen.nix
+++ b/pkgs/desktops/kde-5/plasma/libkscreen.nix
@@ -1,5 +1,5 @@
 { plasmaPackage
-, extra-cmake-modules
+, ecm
 , kwayland, libXrandr
 , qtx11extras
 }:
@@ -7,7 +7,7 @@
 plasmaPackage {
   name = "libkscreen";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   propagatedBuildInputs = [
     kwayland libXrandr qtx11extras
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix
index 2a92d6e0af0b..b6ca3dfa26d6 100644
--- a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix
+++ b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix
@@ -1,4 +1,4 @@
-{ fetchpatch, plasmaPackage, extra-cmake-modules, kauth, kcompletion
+{ fetchpatch, plasmaPackage, ecm, kauth, kcompletion
 , kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
 , kwindowsystem, plasma-framework, qtscript, qtx11extras
 , kconfig, ki18n, kiconthemes
@@ -10,7 +10,7 @@ plasmaPackage {
     ./0001-qdiriterator-follow-symlinks.patch
   ];
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   propagatedBuildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
diff --git a/pkgs/desktops/kde-5/plasma/milou.nix b/pkgs/desktops/kde-5/plasma/milou.nix
index 43f78d9e2a97..dbf9d0b9e537 100644
--- a/pkgs/desktops/kde-5/plasma/milou.nix
+++ b/pkgs/desktops/kde-5/plasma/milou.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
+{ plasmaPackage, ecm, qtscript, qtdeclarative
 , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
 , krunner
 }:
@@ -6,7 +6,7 @@
 plasmaPackage {
   name = "milou";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   propagatedBuildInputs = [
     kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix
index 5a783ca65027..3c54055a6336 100644
--- a/pkgs/desktops/kde-5/plasma/oxygen.nix
+++ b/pkgs/desktops/kde-5/plasma/oxygen.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
+{ plasmaPackage, ecm, ki18n, kcmutils, kconfig
 , kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
 , frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
 }:
@@ -6,7 +6,7 @@
 plasmaPackage {
   name = "oxygen";
   nativeBuildInputs = [
-    extra-cmake-modules makeQtWrapper
+    ecm makeQtWrapper
   ];
   propagatedBuildInputs = [
     kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
index 3a61651644f4..dc4e81ef4eaa 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+{ plasmaPackage, substituteAll, ecm, kdoctools
 , attica, baloo, boost, fontconfig, kactivities, kactivities-stats
 , kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
 , kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
@@ -6,17 +6,13 @@
 , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
 , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
 , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
-, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
+, libcanberra_kde, libpulseaudio, utillinux
 , qtquickcontrols, ksysguard
 }:
 
 plasmaPackage rec {
   name = "plasma-desktop";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   buildInputs = [
     attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
     knotifications knotifyconfig kwallet libcanberra_kde libXcursor
@@ -42,14 +38,4 @@ plasmaPackage rec {
     "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
     "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kaccess"
-    wrapQtProgram "$out/bin/solid-action-desktop-gen"
-    wrapQtProgram "$out/bin/knetattach"
-    wrapQtProgram "$out/bin/krdb"
-    wrapQtProgram "$out/bin/kapplymousetheme"
-    wrapQtProgram "$out/bin/kfontinst"
-    wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
-    wrapQtProgram "$out/bin/kfontview"
-  '';
 }
diff --git a/pkgs/desktops/kde-5/plasma/plasma-integration.nix b/pkgs/desktops/kde-5/plasma/plasma-integration.nix
index 97d30dcd7732..e8680fea930a 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-integration.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-integration.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules
+{ plasmaPackage, ecm
 , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
 , libXcursor
 }:
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "plasma-integration";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   buildInputs = [
     breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
diff --git a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix
index a1e1cf8a127e..1967a0b8a4e0 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig
+{ plasmaPackage, ecm, baloo, kactivities, kconfig
 , kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
 , kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
 , taglib
@@ -7,7 +7,7 @@
 plasmaPackage rec {
   name = "plasma-mediacenter";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   propagatedBuildInputs = [
     baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
index 0ea2ab49f557..b6d18dbf91d9 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+{ plasmaPackage, substituteAll, ecm, kdoctools
 , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
-, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
+, kxmlgui, mobile_broadband_provider_info
 , modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
 , qca-qt5, qtdeclarative, solid
 }:
@@ -15,11 +15,7 @@ plasmaPackage {
       inherit mobile_broadband_provider_info;
     })
   ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
     qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
@@ -27,7 +23,4 @@ plasmaPackage {
     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/plasma-pa.nix b/pkgs/desktops/kde-5/plasma/plasma-pa.nix
index 1712dab773db..b0ad9ac69ffe 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-pa.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-pa.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, glib, kdoctools, kconfigwidgets
+{ plasmaPackage, ecm, glib, kdoctools, kconfigwidgets
 , kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
 , plasma-framework
 }:
@@ -6,7 +6,7 @@
 plasmaPackage {
   name = "plasma-pa";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
     kdoctools
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
index bc87abcad153..6ffdb17cbeab 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
@@ -1,10 +1,11 @@
 { plasmaPackage
-, extra-cmake-modules
+, ecm
 }:
 
 plasmaPackage {
   name = "plasma-workspace-wallpapers";
+  outputs = [ "out" ];
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
index 190003ca5c78..09bba4a709f7 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
+++ b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
@@ -1,7 +1,7 @@
 {
   plasmaPackage, lib, copyPathsToStore,
 
-  extra-cmake-modules, kdoctools,
+  ecm, kdoctools,
 
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
@@ -14,9 +14,7 @@
 plasmaPackage {
   name = "plasma-workspace";
 
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   buildInputs = [
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
diff --git a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
index 68bb3a9ef3dc..002c2bb10ff3 100644
--- a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
+++ b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
@@ -1,22 +1,12 @@
-{ plasmaPackage
-, extra-cmake-modules
-, ki18n
-, kwindowsystem
-, kdbusaddons
-, kwidgetsaddons
-, kcoreaddons
-, kcrash
-, kconfig
-, kiconthemes
-, knotifications
-, polkit-qt
+{
+  plasmaPackage, ecm,
+  kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
+  kwidgetsaddons, kwindowsystem, polkit-qt
 }:
 
 plasmaPackage {
   name = "polkit-kde-agent";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
     knotifications kwindowsystem polkit-qt
diff --git a/pkgs/desktops/kde-5/plasma/powerdevil.nix b/pkgs/desktops/kde-5/plasma/powerdevil.nix
index cbb2b9b019fc..c0c18a6eae6c 100644
--- a/pkgs/desktops/kde-5/plasma/powerdevil.nix
+++ b/pkgs/desktops/kde-5/plasma/powerdevil.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
+{ plasmaPackage, ecm, kdoctools, bluez-qt, kactivities
 , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
 , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
 , plasma-workspace, qtx11extras, solid, udev
@@ -6,10 +6,7 @@
 
 plasmaPackage {
   name = "powerdevil";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
     kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
index 2dbfb6dd04ac..15048dc9da26 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/bluedevil-5.7.1.tar.xz";
-      sha256 = "1sz84r27bc4qavb22haqswr1qjv9m47b8j3knvlpzdln4wpxnb81";
-      name = "bluedevil-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/bluedevil-5.7.2.tar.xz";
+      sha256 = "0lw7yf38vdxl5q8fyqp7xnhppv0r6ayr7wd3m73f1w7fqpkjd9v6";
+      name = "bluedevil-5.7.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/breeze-5.7.1.tar.xz";
-      sha256 = "1sparlwykzr6mjqzv3ghzl59j0xi3yxf0m93sx7d3js92k77rqpk";
-      name = "breeze-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/breeze-5.7.2.tar.xz";
+      sha256 = "150lpy6jd2asbx8s5mznyagja31q5xwhhqqisrlnxapln2qj6xay";
+      name = "breeze-5.7.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/breeze-grub-5.7.1.tar.xz";
-      sha256 = "0ahpsq429f8cdk2w91h9ji9fiqc7g8m9zlg447pz7r6lxnj9aw3x";
-      name = "breeze-grub-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/breeze-grub-5.7.2.tar.xz";
+      sha256 = "1qhgqb3wa8mciddwa0v4kw3vs17annib0qy2jpy5qdfjc4yblq5q";
+      name = "breeze-grub-5.7.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/breeze-gtk-5.7.1.tar.xz";
-      sha256 = "1xcznd9m6kxrv8c4j66m4qqgq02h32714dkjwr754k9qfiava2qg";
-      name = "breeze-gtk-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/breeze-gtk-5.7.2.tar.xz";
+      sha256 = "08jfvxfmzbnk4jjzljlp9wr37b7rmxcwnmi866x5v01x9iqfbcgw";
+      name = "breeze-gtk-5.7.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/breeze-plymouth-5.7.1.tar.xz";
-      sha256 = "16wx7k18yxf2jhxl2wwxy1dzdrrlfr9qkxbw72m5c21spx734wwb";
-      name = "breeze-plymouth-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/breeze-plymouth-5.7.2.tar.xz";
+      sha256 = "16dwqiq26xxpff0fni7aiq919k7jfmi35sj8xvvafb30wm4y3jix";
+      name = "breeze-plymouth-5.7.2.tar.xz";
     };
   };
   discover = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/discover-5.7.1.tar.xz";
-      sha256 = "1r4g4ajyp6ap1nq2n9ngvsgzifypivrkkzfk14c06mmc4fbqblpd";
-      name = "discover-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/discover-5.7.2.tar.xz";
+      sha256 = "0kp3d7d21zxc8ag6f075r8mvfqd5mmk258aix5pyqc1njzb6rgg0";
+      name = "discover-5.7.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kactivitymanagerd-5.7.1.tar.xz";
-      sha256 = "1mc4dxxkvjyrq4khlg1gjhxdhn87xsghwlznp4gnfx4cjgvxi8bq";
-      name = "kactivitymanagerd-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kactivitymanagerd-5.7.2.tar.xz";
+      sha256 = "0asp3jzl1vaqxs0nvkfxx5d8hnnsvcygbjgc4i63l7fjs64a789r";
+      name = "kactivitymanagerd-5.7.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kde-cli-tools-5.7.1.tar.xz";
-      sha256 = "0q3j6kd7yfrp10pbld5pdis8w234442va3h460q9j3bp7n7xp8h9";
-      name = "kde-cli-tools-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kde-cli-tools-5.7.2.tar.xz";
+      sha256 = "0y2pwshsiqgcxvj3yc6vyyhg8fkb5ddslnf1f86r92sy66gbjw0s";
+      name = "kde-cli-tools-5.7.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kdecoration-5.7.1.tar.xz";
-      sha256 = "181vay4alcckv93cralbj980c4zxbmca710dh9qrmy4nfk2y0pq7";
-      name = "kdecoration-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kdecoration-5.7.2.tar.xz";
+      sha256 = "1wpb1kivy570ggrd7ip8n3zllyslzk6qlqc02i8g4rbavw0fxscx";
+      name = "kdecoration-5.7.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kde-gtk-config-5.7.1.tar.xz";
-      sha256 = "18xm51j1604gg9sf9cmchqzgfrchwf2may4qhl2glns3c7xnps94";
-      name = "kde-gtk-config-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kde-gtk-config-5.7.2.tar.xz";
+      sha256 = "08giv5w4055rd70nb28lwapdcfnywx2whgzpc1gdvsbgl6ap742n";
+      name = "kde-gtk-config-5.7.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kdeplasma-addons-5.7.1.tar.xz";
-      sha256 = "13mg01ll9np8av55ilns1dc0k3rv5cix901gp459dl9r05hzhxgp";
-      name = "kdeplasma-addons-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kdeplasma-addons-5.7.2.tar.xz";
+      sha256 = "1qlr3fgp7gqyjyncn1qjajhbvb45sdbp9aqhz6ccnv3smwm74mp7";
+      name = "kdeplasma-addons-5.7.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kgamma5-5.7.1.tar.xz";
-      sha256 = "1myxjj99jmp2n58f4jbarphr12jh9rqpjmvk2dpcijb94sxaimsl";
-      name = "kgamma5-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kgamma5-5.7.2.tar.xz";
+      sha256 = "0jkk0lz4qaxsmgii3i698anpp0a9q0nakpb5h0kxffx5j01s5s25";
+      name = "kgamma5-5.7.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/khotkeys-5.7.1.tar.xz";
-      sha256 = "0djnfax9ba1zm3lkxm2hfa4ai399g1p1n0zfpchjfif8639pf6fk";
-      name = "khotkeys-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/khotkeys-5.7.2.tar.xz";
+      sha256 = "02v0q8j65fbc39krc2gcs42yyx3g056w156zg6d59j6srwci5ksm";
+      name = "khotkeys-5.7.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kinfocenter-5.7.1.tar.xz";
-      sha256 = "0ynm1lb5f2ggc470k805acxrgxbjw00b780psg60m64bh12jn5ws";
-      name = "kinfocenter-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kinfocenter-5.7.2.tar.xz";
+      sha256 = "1xpyi05y9qxv51j8gazk0qlhy2yscz8lgzgh3lw7lp21jv1frxg4";
+      name = "kinfocenter-5.7.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kmenuedit-5.7.1.tar.xz";
-      sha256 = "19188hwidv6vak1qas60jzc7bd6fx1slaqkiwljyx8r6w7l1lx4h";
-      name = "kmenuedit-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kmenuedit-5.7.2.tar.xz";
+      sha256 = "0bavsxh3lsnk5h70l81317vqgmms5r0lr7ph2vdlcfrb708xp0xp";
+      name = "kmenuedit-5.7.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kscreen-5.7.1.tar.xz";
-      sha256 = "0f2zniavlh18ipkn3k6kpzd5nqhlj0pg723dqb3p5zdmxfwddqal";
-      name = "kscreen-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kscreen-5.7.2.tar.xz";
+      sha256 = "1d23i6mw1di01386icdq5p64a3gmq6n6cg73v6wfw3vvgl0lls6w";
+      name = "kscreen-5.7.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kscreenlocker-5.7.1.tar.xz";
-      sha256 = "0dpx1cwvjzsnf9aryavqajlw10iqfmg3vjry50wkg03nb8z1rd49";
-      name = "kscreenlocker-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kscreenlocker-5.7.2.tar.xz";
+      sha256 = "1c4afc7s5b2q5yc53xpp8q2k0w8lxmvg8rrqb6qnrqz1xrxil3ld";
+      name = "kscreenlocker-5.7.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/ksshaskpass-5.7.1.tar.xz";
-      sha256 = "0blmwnm512lld8r3gj2fi7z0cj2nhcngn6xw3568p54ijb5da6c2";
-      name = "ksshaskpass-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/ksshaskpass-5.7.2.tar.xz";
+      sha256 = "07annxlr46h7x6dq5vfs6rzgm11x8bv1n1icgji2wabdj3zsy2pa";
+      name = "ksshaskpass-5.7.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/ksysguard-5.7.1.tar.xz";
-      sha256 = "14b9wspfls4q3zl1rxpr6h5kxx9q6dv10x8lbzmxml1fdkid3i5j";
-      name = "ksysguard-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/ksysguard-5.7.2.tar.xz";
+      sha256 = "08y9vsdzsq18hgfrk52hk3hmv23x6xv4j73dji97g38z26slvbp6";
+      name = "ksysguard-5.7.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kwallet-pam-5.7.1.tar.xz";
-      sha256 = "04jxi4a75km9c5gy30aaikqzsd2z2algvh7w6phfqaqq66h5qx8d";
-      name = "kwallet-pam-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kwallet-pam-5.7.2.tar.xz";
+      sha256 = "1701abpwp90vsi5v4n675848gnp17psiagd5hv9yypc2a7g82sf2";
+      name = "kwallet-pam-5.7.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kwayland-integration-5.7.1.tar.xz";
-      sha256 = "0ix30304ggh12xgqnnb9zrniqhklg3a8rkjnp3fad7sr3wa9346s";
-      name = "kwayland-integration-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kwayland-integration-5.7.2.tar.xz";
+      sha256 = "0jd9cv8ivn71h90xjr53nanx02z95ylsn5pkwx03wjvx4bdwwvpv";
+      name = "kwayland-integration-5.7.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kwin-5.7.1.tar.xz";
-      sha256 = "0mkvfbsv1ivzs02fphm28km55cn258w6sram9zbqldklk2js7is0";
-      name = "kwin-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kwin-5.7.2.tar.xz";
+      sha256 = "00f9chy1qg24r6rqpqfhc4jjx6j1nw18gxzpd1m16shkqf5il15h";
+      name = "kwin-5.7.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/kwrited-5.7.1.tar.xz";
-      sha256 = "0mmb4hmwpcmxc03nzqhybwxk5nlyqamdswmr0vf8jcbvcqdmp473";
-      name = "kwrited-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/kwrited-5.7.2.tar.xz";
+      sha256 = "06j18395pkyiph9mzvmfjjdm623ggijgkalggsz4a7kllk1v964q";
+      name = "kwrited-5.7.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/libkscreen-5.7.1.tar.xz";
-      sha256 = "1my8k7r7i2qh59g46l79xdyci1km3ykxms1314vwzqf7fyadwjnp";
-      name = "libkscreen-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/libkscreen-5.7.2.tar.xz";
+      sha256 = "0ympads0iylpsv0idmbgwc8gzc3xskqcgv1bn4mbpfrp360ibmia";
+      name = "libkscreen-5.7.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/libksysguard-5.7.1.tar.xz";
-      sha256 = "0249cxgfy6yb9dcc9z2ckxwy7khkbzk0922479v900avaf87l4hj";
-      name = "libksysguard-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/libksysguard-5.7.2.tar.xz";
+      sha256 = "0qk14ca9hfbm4ba840yjrar1kqh3dsl2hywqf45lrv42r47k19ak";
+      name = "libksysguard-5.7.2.tar.xz";
     };
   };
   milou = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/milou-5.7.1.tar.xz";
-      sha256 = "0fcrf8q0sxsgjbi9j2h9qcl4g40mvia1zkb98crzir5qb1z6ji1f";
-      name = "milou-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/milou-5.7.2.tar.xz";
+      sha256 = "13w9fn1icxaxslk04a3gb41yb6hw705xj0xkmv5wy198m8f9m84a";
+      name = "milou-5.7.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/oxygen-5.7.1.tar.xz";
-      sha256 = "1pjygznb3fjyyvm84dxxj6smm6hpi5mr0c5077rc1xm2p20g7xn0";
-      name = "oxygen-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/oxygen-5.7.2.tar.xz";
+      sha256 = "0156v7b9capc1j5kv099fy00dzcqiygvmvs9nsy6m3ly7v9av428";
+      name = "oxygen-5.7.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-desktop-5.7.1.tar.xz";
-      sha256 = "1civd76q2lkas8x5pzm57dfjyplmgb91w34avn75lcdkl2p0zq44";
-      name = "plasma-desktop-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-desktop-5.7.2.tar.xz";
+      sha256 = "0kkw4h1vn32qdpzd16334s2m38wcckc06bx1bs99jj6hpmgh6597";
+      name = "plasma-desktop-5.7.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-integration-5.7.1.tar.xz";
-      sha256 = "12cjays5y3zr4za7j49p8yrzk6fxmsgvw4n8i8aida390lbnw5c6";
-      name = "plasma-integration-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-integration-5.7.2.tar.xz";
+      sha256 = "1j8a0c0dxdl7kyj6hm1r5lq7ykg9xhn51s90gyhr6rqs0hla7n6g";
+      name = "plasma-integration-5.7.2.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-mediacenter-5.7.1.tar.xz";
-      sha256 = "135c7vgps9nsna4x5b28p8p2lir7wx2ad6p5m4sg7irf2wr6mivd";
-      name = "plasma-mediacenter-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-mediacenter-5.7.2.tar.xz";
+      sha256 = "1vgb7mlqqlh338p0mqfc613qcdz1c3kwgg9m7yb5fk8kzh9v1fwn";
+      name = "plasma-mediacenter-5.7.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-nm-5.7.1.tar.xz";
-      sha256 = "0siq0na8cqqp0lqp963miwimsr7w9papj6cpf9k0frw40arqk26h";
-      name = "plasma-nm-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-nm-5.7.2.tar.xz";
+      sha256 = "1aqf2jzljzc1wwswxq9gn74p0169sqq9yrm7ngz1ns11b0q8m1bm";
+      name = "plasma-nm-5.7.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-pa-5.7.1.tar.xz";
-      sha256 = "0g4rgsf39imknxbccl77d7j7404gfyv0nh6r0dmli19alhhiczay";
-      name = "plasma-pa-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-pa-5.7.2.tar.xz";
+      sha256 = "0w201rrxjds5i1hc6mn4mpqn6kvpz175r0id9rxqfdzyrqcgknpv";
+      name = "plasma-pa-5.7.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-sdk-5.7.1.tar.xz";
-      sha256 = "1mn54zwq9bcrazv6zh832xyagrd4k1xjdwhdqxqbvq1d139v8shj";
-      name = "plasma-sdk-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-sdk-5.7.2.tar.xz";
+      sha256 = "0zsbrlmv5kgaa53a906ky071vj38i58kz0wqrr2dy2b47pnx77pl";
+      name = "plasma-sdk-5.7.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-workspace-5.7.1.tar.xz";
-      sha256 = "0x4ghm385kkj2ax91vy10p4f481c6ikpk0azmhnk2d685r7x03yn";
-      name = "plasma-workspace-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-5.7.2.tar.xz";
+      sha256 = "1k03g6scbgrsrk1dmfaw6s5sahlck81rka7kpzx60rdas6vfw60y";
+      name = "plasma-workspace-5.7.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/plasma-workspace-wallpapers-5.7.1.tar.xz";
-      sha256 = "0nl3bjb57djzgvx81knrjkbdix9y3j5ggxpd1a6lj80nixicg8h7";
-      name = "plasma-workspace-wallpapers-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-wallpapers-5.7.2.tar.xz";
+      sha256 = "1wzhrix2nafzlszanh05fbcs746c391wp27i24fvh3rhpg5j57zx";
+      name = "plasma-workspace-wallpapers-5.7.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.7.1";
+    version = "1-5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/polkit-kde-agent-1-5.7.1.tar.xz";
-      sha256 = "1pcmdplxq0fsa3bdxyl73vpndvhlmsmjbqfc35aa1ds2wkj7ql2q";
-      name = "polkit-kde-agent-1-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/polkit-kde-agent-1-5.7.2.tar.xz";
+      sha256 = "0kx021xjgsp1gpv2s9kigxf1srabkly2l61hf5wpj0hml79dwrc5";
+      name = "polkit-kde-agent-1-5.7.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/powerdevil-5.7.1.tar.xz";
-      sha256 = "0vdrpfgdw2c2gp6cwmrwyrwgfgxfslypa5ls79cf9wqgkrlh3phy";
-      name = "powerdevil-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/powerdevil-5.7.2.tar.xz";
+      sha256 = "132k18dqm487f8v2irxlxhs1ljvcyyig9lkb36isajsw7k6949vb";
+      name = "powerdevil-5.7.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/sddm-kcm-5.7.1.tar.xz";
-      sha256 = "0bnfy0ndg5040za73sj41ajskwx7bvfa4x92wrfzv27gda3c7fdg";
-      name = "sddm-kcm-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/sddm-kcm-5.7.2.tar.xz";
+      sha256 = "19bxbpz80pr66gd9mycwfcw8sagkpzbffm98bzikpdjcll6a6ysh";
+      name = "sddm-kcm-5.7.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/systemsettings-5.7.1.tar.xz";
-      sha256 = "0arcvhqvcsm59l3fm6brqqcv1084qm8wawj9dj6w5wb194ys41hw";
-      name = "systemsettings-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/systemsettings-5.7.2.tar.xz";
+      sha256 = "0f2q0mfhmn0nf4mx76hp3lxciwiivsqq3ayv15s1hzxpi24vsini";
+      name = "systemsettings-5.7.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.7.1";
+    version = "5.7.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.7.1/user-manager-5.7.1.tar.xz";
-      sha256 = "1jzwwzixwbb6f92zi09i3jfs4dqsg3kcjis60w1bh2pkm96gq35y";
-      name = "user-manager-5.7.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.7.2/user-manager-5.7.2.tar.xz";
+      sha256 = "0faf4wnbkcx6wlg92cd8mskp1xhqm0crj886y22ycjiaqhbnc43p";
+      name = "user-manager-5.7.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/kde-5/plasma/systemsettings.nix
index 47264cf38fd7..407d0e916264 100644
--- a/pkgs/desktops/kde-5/plasma/systemsettings.nix
+++ b/pkgs/desktops/kde-5/plasma/systemsettings.nix
@@ -1,22 +1,14 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
-, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
-, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
+{
+  plasmaPackage, ecm, kdoctools, makeQtWrapper,
+  kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
+  kservice, kwindowsystem, kxmlgui, qtquickcontrols
 }:
 
 plasmaPackage {
   name = "systemsettings";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
-    khtml ki18n kio kwindowsystem kitemviews kcmutils kservice kiconthemes
-    kxmlgui kdbusaddons kconfig
+    kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
+    kwindowsystem kxmlgui qtquickcontrols
   ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/systemsettings5"
-  '';
 }