kde5: fix all the Qt version dependencies

29 files changed, 144 insertions, 386 deletions

diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/desktops/kde-5/applications/ark/default.nix
index 0af13b645e1..503ea6d8cfc 100644
--- a/pkgs/desktops/kde-5/applications/ark/default.nix
+++ b/pkgs/desktops/kde-5/applications/ark/default.nix
@@ -1,7 +1,7 @@
 {
   kdeApp, lib,
 
-  extra-cmake-modules, kdoctools, makeQtWrapper,
+  ecm, kdoctools, makeQtWrapper,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
   kservice, kpty, kwidgetsaddons, libarchive,
@@ -13,7 +13,7 @@
 kdeApp {
   name = "ark";
   nativeBuildInputs = [
-    extra-cmake-modules kdoctools makeQtWrapper
+    ecm kdoctools makeQtWrapper
   ];
   propagatedBuildInputs = [
     khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
diff --git a/pkgs/desktops/kde-5/applications/baloo-widgets.nix b/pkgs/desktops/kde-5/applications/baloo-widgets.nix
index fc91c92dbe6..f6f3a7ce14e 100644
--- a/pkgs/desktops/kde-5/applications/baloo-widgets.nix
+++ b/pkgs/desktops/kde-5/applications/baloo-widgets.nix
@@ -1,14 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, kconfig
-, kio
-, ki18n
-, kservice
-, kfilemetadata
-, baloo
-, kdelibs4support
+{
+  kdeApp, lib,
+  ecm, kdoctools,
+  baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
 }:
 
 kdeApp {
@@ -17,11 +10,8 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
-    baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio
+    baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
   ];
 }
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 329fca9c849..c980d4f7d20 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -23,6 +23,7 @@ let
     kdeApp = import ./kde-app.nix {
       inherit kdeDerivation lib;
       inherit debug srcs;
+      inherit (pkgs) cmake pkgconfig;
     };
 
     kdelibs = callPackage ./kdelibs {
@@ -54,9 +55,7 @@ let
     libkexiv2 = callPackage ./libkexiv2.nix {};
     libkipi = callPackage ./libkipi.nix {};
     libkomparediff2 = callPackage ./libkomparediff2.nix {};
-    okular = callPackage ./okular.nix {
-      inherit (srcs.okular) src version;
-    };
+    okular = callPackage ./okular.nix {};
     print-manager = callPackage ./print-manager.nix {};
     spectacle = callPackage ./spectacle.nix {};
 
diff --git a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications/dolphin-plugins.nix
index 962dd2ba720..500dd29c100 100644
--- a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-5/applications/dolphin-plugins.nix
@@ -1,12 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, kxmlgui
-, ki18n
-, kio
-, kdelibs4support
-, dolphin
+{
+  kdeApp, lib,
+  ecm, kdoctools,
+  dolphin, kdelibs4support, ki18n, kio, kxmlgui
 }:
 
 kdeApp {
@@ -15,11 +10,6 @@ kdeApp {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support ki18n kio kxmlgui dolphin
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
+  propagatedBuildInputs = [ dolphin kdelibs4support ki18n kio kxmlgui ];
 }
diff --git a/pkgs/desktops/kde-5/applications/dolphin.nix b/pkgs/desktops/kde-5/applications/dolphin.nix
index 168854383fa..8145d948391 100644
--- a/pkgs/desktops/kde-5/applications/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications/dolphin.nix
@@ -1,30 +1,10 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, kinit
-, kcmutils
-, kcoreaddons
-, knewstuff
-, ki18n
-, kdbusaddons
-, kbookmarks
-, kconfig
-, kio
-, kparts
-, solid
-, kiconthemes
-, kcompletion
-, ktexteditor
-, kwindowsystem
-, knotifications
-, kactivities
-, phonon
-, baloo
-, baloo-widgets
-, kfilemetadata
-, kdelibs4support
+{
+  kdeApp, lib,
+  ecm, kdoctools, makeQtWrapper,
+  baloo, baloo-widgets, kactivities, kbookmarks, kcmutils, kcompletion, kconfig,
+  kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes,
+  kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem,
+  phonon, solid
 }:
 
 kdeApp {
@@ -33,16 +13,12 @@ kdeApp {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
-    kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts
-    solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo
-    kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor
-    kwindowsystem
+    baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
+    kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
+    kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem phonon
+    solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/dolphin"
diff --git a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix
index feacf7e437e..c063b1e6035 100644
--- a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix
@@ -1,8 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, ffmpeg
-, kio
+{
+  kdeApp, lib,
+  ecm,
+  ffmpeg, kio
 }:
 
 kdeApp {
@@ -11,11 +10,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    ffmpeg
-    kio
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ ffmpeg kio ];
 }
diff --git a/pkgs/desktops/kde-5/applications/filelight.nix b/pkgs/desktops/kde-5/applications/filelight.nix
index 5ac101fa501..523c236ba26 100644
--- a/pkgs/desktops/kde-5/applications/filelight.nix
+++ b/pkgs/desktops/kde-5/applications/filelight.nix
@@ -1,13 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, qtscript
-, kio
-, solid
-, kxmlgui
-, kparts
+{
+  kdeApp, lib,
+  ecm, kdoctools, makeQtWrapper,
+  kio, kparts, kxmlgui, qtscript, solid
 }:
 
 kdeApp {
@@ -16,13 +10,9 @@ kdeApp {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh vcunat ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
-    kio kparts qtscript solid kxmlgui
+    kio kparts kxmlgui qtscript solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/filelight"
diff --git a/pkgs/desktops/kde-5/applications/gpgmepp.nix b/pkgs/desktops/kde-5/applications/gpgmepp.nix
index 8d6f11879d3..0e5cb15029c 100644
--- a/pkgs/desktops/kde-5/applications/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications/gpgmepp.nix
@@ -1,8 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, boost
-, gpgme
+{
+  kdeApp, lib,
+  ecm,
+  boost, gpgme
 }:
 
 kdeApp {
@@ -11,10 +10,6 @@ kdeApp {
     license = with lib.licenses; [ lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    boost gpgme
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ boost gpgme ];
 }
diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/desktops/kde-5/applications/gwenview.nix
index 20fc554d01a..e2b2fa014a9 100644
--- a/pkgs/desktops/kde-5/applications/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications/gwenview.nix
@@ -1,17 +1,8 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, baloo
-, exiv2
-, kactivities
-, kdelibs4support
-, kio
-, lcms2
-, phonon
-, qtsvg
-, qtx11extras
+{
+  kdeApp, lib,
+  ecm, kdoctools, makeQtWrapper,
+  baloo, exiv2, kactivities, kdelibs4support, kio, lcms2, phonon,
+  qtsvg, qtx11extras
 }:
 
 kdeApp {
@@ -20,11 +11,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg
   ];
diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/desktops/kde-5/applications/kate.nix
index 94faa065592..4459dea8063 100644
--- a/pkgs/desktops/kde-5/applications/kate.nix
+++ b/pkgs/desktops/kde-5/applications/kate.nix
@@ -1,9 +1,9 @@
 {
-  kdeApp, lib, makeQtWrapper, extra-cmake-modules, kdoctools,
+  kdeApp, lib, makeQtWrapper, ecm, kdoctools,
   kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit,
   kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons,
-  kwallet, plasma-framework, kitemmodels, knotifications, qtscript, threadweaver,
-  knewstuff, libgit2
+  kwallet, plasma-framework, kitemmodels, knotifications, qtscript,
+  threadweaver, knewstuff, libgit2
 }:
 
 kdeApp {
@@ -12,9 +12,7 @@ kdeApp {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript
     kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui
diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/desktops/kde-5/applications/kcalc.nix
index 7bdc799aeb9..ca1254e6974 100644
--- a/pkgs/desktops/kde-5/applications/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications/kcalc.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, makeQtWrapper, kdoctools,
-  extra-cmake-modules, kconfig, kconfigwidgets, kguiaddons, kinit,
+  ecm, kconfig, kconfigwidgets, kguiaddons, kinit,
   knotifications, gmp
 }:
 
@@ -10,7 +10,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     gmp kconfig kconfigwidgets kguiaddons kinit knotifications
   ];
diff --git a/pkgs/desktops/kde-5/applications/kcolorchooser.nix b/pkgs/desktops/kde-5/applications/kcolorchooser.nix
index 8726f6870ca..d5e0eff21e4 100644
--- a/pkgs/desktops/kde-5/applications/kcolorchooser.nix
+++ b/pkgs/desktops/kde-5/applications/kcolorchooser.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib
-, extra-cmake-modules
-, ki18n, kwidgetsaddons, kxmlgui
+{
+  kdeApp, lib,
+  ecm, ki18n, kwidgetsaddons, kxmlgui
 }:
 
 kdeApp {
@@ -9,6 +9,6 @@ kdeApp {
     license = with lib.licenses; [ mit ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
 }
diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/desktops/kde-5/applications/kde-app.nix
index c0a947a65da..a167eeb4636 100644
--- a/pkgs/desktops/kde-5/applications/kde-app.nix
+++ b/pkgs/desktops/kde-5/applications/kde-app.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, debug, srcs }:
+{ kdeDerivation, lib, debug, srcs, cmake, pkgconfig }:
 
 args:
 
@@ -11,6 +11,15 @@ kdeDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
+  cmakeFlags =
+    (args.cmakeFlags or [])
+    ++ [ "-DBUILD_TESTING=OFF" ]
+    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  nativeBuildInputs =
+    (args.nativeBuildInputs or [])
+    ++ [ cmake pkgconfig ];
+
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
diff --git a/pkgs/desktops/kde-5/applications/kde-locale-5.nix b/pkgs/desktops/kde-5/applications/kde-locale-5.nix
index 772ebe37e44..2b9cc0e35eb 100644
--- a/pkgs/desktops/kde-5/applications/kde-locale-5.nix
+++ b/pkgs/desktops/kde-5/applications/kde-locale-5.nix
@@ -1,6 +1,6 @@
 name: args:
 
-{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
+{ kdeApp, cmake, ecm, gettext, kdoctools }:
 
 kdeApp (args // {
   sname = "kde-l10n-${name}";
@@ -9,7 +9,7 @@ kdeApp (args // {
   outputs = [ "out" ];
 
   nativeBuildInputs =
-    [ cmake extra-cmake-modules gettext kdoctools ]
+    [ cmake ecm gettext kdoctools ]
     ++ (args.nativeBuildInputs or []);
 
   preConfigure = ''
diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix
index cddf064e47b..c3947226690 100644
--- a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix
+++ b/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix
@@ -1,9 +1,6 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kio
-, libkexiv2
-, libkdcraw
+{
+  kdeApp, lib,
+  ecm, kio, libkexiv2, libkdcraw
 }:
 
 kdeApp {
@@ -12,10 +9,6 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kio libkexiv2 libkdcraw
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
 }
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix
index 2a8db2fbfba..4ddc25ba644 100644
--- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix
+++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix
@@ -1,14 +1,13 @@
 {
-  stdenv, lib, src, version,
+  kdeApp, lib, src, version,
   automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
   attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
   libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
   shared_desktop_ontologies, soprano, strigi, udev, xz, pcre
 }:
 
-stdenv.mkDerivation {
-  name = "kdelibs-${version}";
-  inherit src;
+kdeApp {
+  name = "kdelibs";
 
   outputs = [ "out" ];
 
diff --git a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix
index 2190ab8ea64..4aa11967528 100644
--- a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix
@@ -1,12 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, kcoreaddons
-, ki18n
-, kio
-, kwidgetsaddons
-, samba
+{
+  kdeApp, lib,
+  ecm, kdoctools,
+  kcoreaddons, ki18n, kio, kwidgetsaddons, samba
 }:
 
 kdeApp {
@@ -15,11 +10,6 @@ kdeApp {
     license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    kcoreaddons ki18n kio kwidgetsaddons samba
-  ];
+  nativeBuildInputs = [ ecm kdoctools ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
 }
diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/desktops/kde-5/applications/kgpg.nix
index 3ee92519718..6717dc1511d 100644
--- a/pkgs/desktops/kde-5/applications/kgpg.nix
+++ b/pkgs/desktops/kde-5/applications/kgpg.nix
@@ -1,32 +1,13 @@
-{ kdeApp
-, lib
-, automoc4
-, cmake
-, makeWrapper
-, perl
-, pkgconfig
-, boost
-, gpgme
-, kdelibs
-, kdepimlibs
-, gnupg
+{
+  kdeApp, lib,
+  automoc4, cmake, makeWrapper, perl, pkgconfig,
+  boost, gpgme, kdelibs, kdepimlibs, gnupg
 }:
 
 kdeApp {
   name = "kgpg";
-  nativeBuildInputs = [
-    automoc4
-    cmake
-    makeWrapper
-    perl
-    pkgconfig
-  ];
-  buildInputs = [
-    boost
-    gpgme
-    kdelibs
-    kdepimlibs
-  ];
+  nativeBuildInputs = [ automoc4 cmake makeWrapper perl pkgconfig ];
+  buildInputs = [ boost gpgme kdelibs kdepimlibs ];
   postInstall = ''
     wrapProgram "$out/bin/kgpg" \
         --prefix PATH : "${gnupg}/bin"
diff --git a/pkgs/desktops/kde-5/applications/khelpcenter.nix b/pkgs/desktops/kde-5/applications/khelpcenter.nix
index 3cdcf22cf75..aab0c051e80 100644
--- a/pkgs/desktops/kde-5/applications/khelpcenter.nix
+++ b/pkgs/desktops/kde-5/applications/khelpcenter.nix
@@ -1,18 +1,15 @@
-{ kdeApp, extra-cmake-modules, kdoctools, makeQtWrapper
-, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils
-, kdelibs4support, khtml, kservice
-, xapian
+{
+  kdeApp, ecm, kdoctools, makeQtWrapper,
+  grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
+  kdelibs4support, khtml, kservice, xapian
 }:
 
 kdeApp {
   name = "khelpcenter";
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   buildInputs = [
     grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit
-    kcmutils kservice
-    xapian
+    kcmutils kservice xapian
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/khelpcenter"
diff --git a/pkgs/desktops/kde-5/applications/kio-extras.nix b/pkgs/desktops/kde-5/applications/kio-extras.nix
index 9d28066cae9..d9fe6a61ac3 100644
--- a/pkgs/desktops/kde-5/applications/kio-extras.nix
+++ b/pkgs/desktops/kde-5/applications/kio-extras.nix
@@ -1,26 +1,9 @@
-{ kdeApp, lib
-, extra-cmake-modules, kdoctools
-, shared_mime_info
-, exiv2
-, kactivities, karchive
-, kbookmarks
-, kconfig, kconfigwidgets
-, kcoreaddons, kdbusaddons, kguiaddons
-, kdnssd
-, kiconthemes
-, ki18n
-, kio
-, khtml
-, kdelibs4support
-, kpty
-, libmtp
-, libssh
-, openexr, ilmbase
-, openslp
-, phonon
-, qtsvg
-, samba
-, solid
+{
+  kdeApp, lib, ecm, kdoctools, shared_mime_info,
+  exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
+  kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
+  kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
+  qtsvg, samba, solid
 }:
 
 kdeApp {
@@ -29,10 +12,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools
-    shared_mime_info
-  ];
+  nativeBuildInputs = [ ecm kdoctools shared_mime_info ];
   propagatedBuildInputs = [
     exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
diff --git a/pkgs/desktops/kde-5/applications/kompare.nix b/pkgs/desktops/kde-5/applications/kompare.nix
index 55bbfc44860..de2dd9338a2 100644
--- a/pkgs/desktops/kde-5/applications/kompare.nix
+++ b/pkgs/desktops/kde-5/applications/kompare.nix
@@ -1,12 +1,6 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, kparts
-, ktexteditor
-, kwidgetsaddons
-, libkomparediff2
+{
+  kdeApp, lib, ecm, kdoctools, makeQtWrapper,
+  kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
 kdeApp {
@@ -15,18 +9,9 @@ kdeApp {
     license = with lib.licenses; [ gpl2 ];
   };
 
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
 
-  propagatedBuildInputs = [
-    kparts
-    ktexteditor
-    kwidgetsaddons
-    libkomparediff2
-  ];
+  propagatedBuildInputs = [ kparts ktexteditor kwidgetsaddons libkomparediff2 ];
 
   postInstall = ''
     wrapQtProgram "$out/bin/kompare"
diff --git a/pkgs/desktops/kde-5/applications/konsole.nix b/pkgs/desktops/kde-5/applications/konsole.nix
index 2042611f61b..1d12c671fa8 100644
--- a/pkgs/desktops/kde-5/applications/konsole.nix
+++ b/pkgs/desktops/kde-5/applications/konsole.nix
@@ -1,29 +1,10 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, qtscript
-, kbookmarks
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kguiaddons
-, ki18n
-, kiconthemes
-, kinit
-, kdelibs4support
-, kio
-, knotifications
-, knotifyconfig
-, kparts
-, kpty
-, kservice
-, ktextwidgets
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
+{
+  kdeApp, lib,
+  ecm, kdoctools, makeQtWrapper,
+  kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
+  ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
+  knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
+  kwindowsystem, kxmlgui, qtscript
 }:
 
 kdeApp {
@@ -32,9 +13,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig
     kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications
diff --git a/pkgs/desktops/kde-5/applications/libkdcraw.nix b/pkgs/desktops/kde-5/applications/libkdcraw.nix
index 1c1ef7dc996..421f7dbb4cf 100644
--- a/pkgs/desktops/kde-5/applications/libkdcraw.nix
+++ b/pkgs/desktops/kde-5/applications/libkdcraw.nix
@@ -1,8 +1,4 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, libraw
-}:
+{ kdeApp, lib, ecm, libraw }:
 
 kdeApp {
   name = "libkdcraw";
@@ -10,10 +6,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    libraw
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ libraw ];
 }
diff --git a/pkgs/desktops/kde-5/applications/libkexiv2.nix b/pkgs/desktops/kde-5/applications/libkexiv2.nix
index 5a46912a109..0fac0759ab6 100644
--- a/pkgs/desktops/kde-5/applications/libkexiv2.nix
+++ b/pkgs/desktops/kde-5/applications/libkexiv2.nix
@@ -1,8 +1,4 @@
-{ kdeApp
-, lib
-, exiv2
-, extra-cmake-modules
-}:
+{ kdeApp, lib, exiv2, ecm }:
 
 kdeApp {
   name = "libkexiv2";
@@ -10,10 +6,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    exiv2
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ exiv2 ];
 }
diff --git a/pkgs/desktops/kde-5/applications/libkipi.nix b/pkgs/desktops/kde-5/applications/libkipi.nix
index 33903463714..fa9dcc8323d 100644
--- a/pkgs/desktops/kde-5/applications/libkipi.nix
+++ b/pkgs/desktops/kde-5/applications/libkipi.nix
@@ -1,11 +1,4 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kconfig
-, ki18n
-, kservice
-, kxmlgui
-}:
+{ kdeApp, lib, ecm, kconfig, ki18n, kservice, kxmlgui }:
 
 kdeApp {
   name = "libkipi";
@@ -13,10 +6,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kconfig ki18n kservice kxmlgui
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
 }
diff --git a/pkgs/desktops/kde-5/applications/libkomparediff2.nix b/pkgs/desktops/kde-5/applications/libkomparediff2.nix
index d6a4878ffbd..91b469fed3c 100644
--- a/pkgs/desktops/kde-5/applications/libkomparediff2.nix
+++ b/pkgs/desktops/kde-5/applications/libkomparediff2.nix
@@ -1,23 +1,7 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, ki18n
-, kxmlgui
-, kcodecs
-, kio
-}:
+{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }:
 
 kdeApp {
   name = "libkomparediff2";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-
-  propagatedBuildInputs = [
-    kcodecs
-    ki18n
-    kxmlgui
-    kio
-  ];
+  nativeBuildInputs = [ ecm ];
+  propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
 }
diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix
index 5a21c18b88a..339b7c8a9a3 100644
--- a/pkgs/desktops/kde-5/applications/okular.nix
+++ b/pkgs/desktops/kde-5/applications/okular.nix
@@ -1,14 +1,12 @@
 {
   stdenv, lib,
-  src, version,
   automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz,
   poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype,
   ebook_tools
 }:
 
 stdenv.mkDerivation {
-  name = "okular-${version}";
-  inherit src;
+  name = "okular";
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
   buildInputs = [
     kdelibs qimageblitz poppler_qt4 libspectre libkexiv2 djvulibre libtiff
diff --git a/pkgs/desktops/kde-5/applications/print-manager.nix b/pkgs/desktops/kde-5/applications/print-manager.nix
index cf0703b7d2c..c4a82780b44 100644
--- a/pkgs/desktops/kde-5/applications/print-manager.nix
+++ b/pkgs/desktops/kde-5/applications/print-manager.nix
@@ -1,20 +1,8 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, qtdeclarative
-, cups
-, kconfig
-, kconfigwidgets
-, kdbusaddons
-, kiconthemes
-, ki18n
-, kcmutils
-, kio
-, knotifications
-, plasma-framework
-, kwidgetsaddons
-, kwindowsystem
-, kitemviews
+{
+  kdeApp, lib, ecm,
+  cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
+  knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
+  qtdeclarative
 }:
 
 kdeApp {
@@ -23,9 +11,7 @@ kdeApp {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
     kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/desktops/kde-5/applications/spectacle.nix
index 867c0b53b1e..2665d840c38 100644
--- a/pkgs/desktops/kde-5/applications/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications/spectacle.nix
@@ -1,20 +1,7 @@
-{ kdeApp, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, kconfig
-, kcoreaddons
-, kdbusaddons
-, kdeclarative
-, ki18n
-, kio
-, knotifications
-, kscreen
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-, libkipi
-, xcb-util-cursor
+{
+  kdeApp, lib, ecm, kdoctools, makeQtWrapper,
+  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, knotifications,
+  kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor
 }:
 
 kdeApp {
@@ -22,9 +9,7 @@ kdeApp {
   meta = with lib; {
     maintainers = with maintainers; [ ttuegel ];
   };
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools makeQtWrapper
-  ];
+  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor