kde5: fix extra-cmake-modules hooks

pkgs/development/libraries/kde-frameworks/attica.nix

@@ -1,11 +1,7 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
+{ kdeFramework, lib, ecm }:
 
 kdeFramework {
   name = "attica";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/baloo.nix

@@ -1,16 +1,14 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
+{ kdeFramework, lib, ecm, kauth, kconfig
 , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
 , kio, lmdb, qtbase, solid
 }:
 
 kdeFramework {
   name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
     kidletime lmdb qtbase solid
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/development/libraries/kde-frameworks/bluez-qt.nix

@@ -1,17 +1,15 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , qtdeclarative
 }:
 
 kdeFramework {
   name = "bluez-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtdeclarative ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
       --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

pkgs/development/libraries/kde-frameworks/breeze-icons.nix

@@ -1,12 +1,10 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtsvg
-}:
+{ kdeFramework, lib, ecm, qtsvg }:
 
 kdeFramework {
   name = "breeze-icons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   outputs = [ "out" ];
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtsvg ];
   propagatedUserEnvPkgs = [ qtsvg.out ];
 }

pkgs/development/libraries/kde-frameworks/default.nix

@@ -31,10 +31,6 @@ let
           ++ [ "-DBUILD_TESTING=OFF" ]
           ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
-        nativeBuildInputs =
-          (args.nativeBuildInputs or [])
-          ++ [ pkgs.cmake pkgs.pkgconfig ecm ];
-
       });
 
     kdeFramework = args:
@@ -59,9 +55,9 @@ let
     bluez-qt = callPackage ./bluez-qt.nix {};
     breeze-icons = callPackage ./breeze-icons.nix {};
     ecm =
-      let drv = { qtbase, qttools }:
+      let drv = { cmake, extra-cmake-modules, pkgconfig, qtbase, qttools }:
             makeSetupHook
-            { deps = [ extra-cmake-modules qtbase qttools ]; }
+            { deps = [ cmake extra-cmake-modules pkgconfig qtbase qttools ]; }
             ./setup-hook.sh;
       in callPackage drv {};
     extra-cmake-modules = callPackage ./extra-cmake-modules {

pkgs/development/libraries/kde-frameworks/frameworkintegration.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
+{ kdeFramework, lib, ecm, kbookmarks, kcompletion
 , kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
 , kwidgetsaddons, libXcursor, qtx11extras
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio
     kiconthemes kwidgetsaddons libXcursor qtx11extras

pkgs/development/libraries/kde-frameworks/kactivities-stats.nix

@@ -1,9 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules
-, boost, kactivities, kconfig }:
+{ kdeFramework, lib, ecm, boost, kactivities, kconfig }:
 
 kdeFramework {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ boost kactivities kconfig ];
 }

pkgs/development/libraries/kde-frameworks/kactivities.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+{ kdeFramework, lib, ecm, boost, kcmutils, kconfig
 , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
 , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
     ki18n kio kservice kwindowsystem kxmlgui qtdeclarative

pkgs/development/libraries/kde-frameworks/kapidox.nix

@@ -1,10 +1,7 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, python
-}:
+{ kdeFramework, lib, ecm, python }:
 
 kdeFramework {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules python ];
+  nativeBuildInputs = [ ecm python ];
 }

pkgs/development/libraries/kde-frameworks/karchive.nix

@@ -1,9 +1,7 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
+{ kdeFramework, lib, ecm }:
 
 kdeFramework {
   name = "karchive";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kauth/default.nix

@@ -1,13 +1,9 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, kcoreaddons
-, polkit-qt
-}:
+{ kdeFramework, lib, copyPathsToStore, ecm, kcoreaddons, polkit-qt }:
 
 kdeFramework {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcoreaddons polkit-qt ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

pkgs/development/libraries/kde-frameworks/kbookmarks.nix

@@ -1,17 +1,12 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kiconthemes
-, kxmlgui
+{
+  kdeFramework, lib, ecm,
+  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
 }:
 
 kdeFramework {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];

pkgs/development/libraries/kde-frameworks/kcmutils/default.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
+{ kdeFramework, lib, ecm, kconfigwidgets
 , kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
 , kpackage, kservice, kxmlgui
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
     kpackage kservice kxmlgui

pkgs/development/libraries/kde-frameworks/kcodecs.nix

@@ -1,11 +1,7 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
+{ kdeFramework, lib, ecm }:
 
 kdeFramework {
   name = "kcodecs";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kcompletion.nix

@@ -1,12 +1,8 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kwidgetsaddons
-}:
+{ kdeFramework, lib, ecm, kconfig, kwidgetsaddons }:
 
 kdeFramework {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kconfig kwidgetsaddons ];
 }

pkgs/development/libraries/kde-frameworks/kconfig.nix

@@ -1,9 +1,7 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
+{ kdeFramework, lib, ecm }:
 
 kdeFramework {
   name = "kconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix

@@ -1,12 +1,15 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons
+{
+  kdeFramework, lib, ecm,
+  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
 }:
 
 kdeFramework {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ];
+  nativeBuildInputs = [ ecm kdoctools ];
+  propagatedBuildInputs = [
+    kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
+  ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   postInstall = ''
     moveToOutput "bin/preparetips5" "$dev"

pkgs/development/libraries/kde-frameworks/kcoreaddons.nix

@@ -1,11 +1,8 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, shared_mime_info
-}:
+{ kdeFramework, lib, ecm, shared_mime_info }:
 
 kdeFramework {
   name = "kcoreaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ shared_mime_info ];
 }

pkgs/development/libraries/kde-frameworks/kcrash.nix

@@ -1,13 +1,8 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwindowsystem
-, qtx11extras
-}:
+{ kdeFramework, lib, ecm, kcoreaddons, kwindowsystem, qtx11extras }:
 
 kdeFramework {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kdbusaddons.nix

@@ -1,11 +1,8 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
+{ kdeFramework, lib, ecm, qtx11extras }:
 
 kdeFramework {
   name = "kdbusaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kdeclarative.nix

@@ -1,13 +1,13 @@
-{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, pkgconfig
-, qtdeclarative
+{
+  kdeFramework, lib, ecm,
+  epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
+  kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
 }:
 
 kdeFramework {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
     kwidgetsaddons kwindowsystem qtdeclarative

pkgs/development/libraries/kde-frameworks/kded.nix

@@ -1,17 +1,13 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, kinit
-, kservice
+{
+  kdeFramework, lib, ecm,
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
 }:
 
 kdeFramework {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  nativeBuildInputs = [ ecm kdoctools ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kinit kservice
+  ];
 }

pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, docbook_xml_dtd_45, kauth
+, ecm, docbook_xml_dtd_45, kauth
 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
@@ -13,10 +13,9 @@
 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 ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
     kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n

pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , kcompletion
 , kconfig
 , kconfigwidgets
@@ -18,7 +18,7 @@
 kdeFramework {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
     kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet

pkgs/development/libraries/kde-frameworks/kdesu.nix

@@ -1,10 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{ kdeFramework, lib, ecm, kcoreaddons, ki18n, kpty
 , kservice
 }:
 
 kdeFramework {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
 }

pkgs/development/libraries/kde-frameworks/kdnssd.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , avahi
 }:
 
 kdeFramework {
   name = "kdnssd";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ avahi ];
 }

pkgs/development/libraries/kde-frameworks/kdoctools/default.nix

@@ -1,11 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
+{ kdeFramework, lib, ecm, docbook_xml_dtd_45
 , docbook5_xsl, karchive, ki18n, perl, perlPackages
 }:
 
 kdeFramework {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ perl perlPackages.URI ];
   cmakeFlags = [

pkgs/development/libraries/kde-frameworks/kemoticons.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , karchive
 , kconfig
 , kcoreaddons
@@ -9,6 +9,6 @@
 kdeFramework {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
 }

pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
+{ kdeFramework, lib, copyPathsToStore, ecm
 , attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
 }:
 
@@ -6,7 +6,7 @@ kdeFramework {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
   ];

pkgs/development/libraries/kde-frameworks/kglobalaccel.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , kconfig
 , kcoreaddons
 , kcrash
@@ -11,7 +11,7 @@
 kdeFramework {
   name = "kglobalaccel";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras
   ];

pkgs/development/libraries/kde-frameworks/kguiaddons.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , qtx11extras
 }:
 
 kdeFramework {
   name = "kguiaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/khtml.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
+{ kdeFramework, lib, ecm, giflib, karchive
 , kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
 , knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
 , kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
@@ -7,7 +7,7 @@
 kdeFramework {
   name = "khtml";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules perl ];
+  nativeBuildInputs = [ ecm perl ];
   propagatedBuildInputs = [
     giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
     knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem

pkgs/development/libraries/kde-frameworks/ki18n.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , gettext
 , python
 , qtdeclarative
@@ -9,7 +9,7 @@
 kdeFramework {
   name = "ki18n";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtdeclarative qtscript ];
   propagatedNativeBuildInputs = [ gettext python ];
 }

pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
+, ecm
 , karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
 }:
 
@@ -7,6 +7,6 @@ kdeFramework {
   name = "kiconthemes";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
 }

pkgs/development/libraries/kde-frameworks/kidletime.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , qtbase
 , qtx11extras
 }:
@@ -7,6 +7,6 @@
 kdeFramework {
   name = "kidletime";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtbase qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kimageformats.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , ilmbase
 }:
 
 kdeFramework {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 }

pkgs/development/libraries/kde-frameworks/kinit/default.nix

@@ -1,13 +1,13 @@
 {
   kdeFramework, lib, copyPathsToStore,
-  extra-cmake-modules, kdoctools,
+  ecm, kdoctools,
   kconfig, kcrash, ki18n, kio, kservice, kwindowsystem
 }:
 
 kdeFramework {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];

pkgs/development/libraries/kde-frameworks/kio/default.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
+, ecm, acl, karchive
 , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
 , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
@@ -10,7 +10,7 @@
 kdeFramework {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
     kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice

pkgs/development/libraries/kde-frameworks/kitemmodels.nix

@@ -1,9 +1,9 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 }:
 
 kdeFramework {
   name = "kitemmodels";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kitemviews.nix

@@ -1,9 +1,9 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 }:
 
 kdeFramework {
   name = "kitemviews";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kjobwidgets.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , kcoreaddons
 , kwidgetsaddons
 , qtx11extras
@@ -8,6 +8,6 @@
 kdeFramework {
   name = "kjobwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kjs.nix

@@ -1,10 +1,10 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , kdoctools
 }:
 
 kdeFramework {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
 }

pkgs/development/libraries/kde-frameworks/kjsembed.nix

@@ -1,10 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+{ kdeFramework, lib, ecm, kdoctools, ki18n, kjs
 , qtsvg
 }:
 
 kdeFramework {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [ ki18n kjs qtsvg ];
 }

pkgs/development/libraries/kde-frameworks/kmediaplayer.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , kparts
 , kxmlgui
 }:
@@ -7,6 +7,6 @@
 kdeFramework {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kparts kxmlgui ];
 }

pkgs/development/libraries/kde-frameworks/knewstuff.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
+{ kdeFramework, lib, ecm, attica, karchive
 , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
 , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
     kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui

pkgs/development/libraries/kde-frameworks/knotifications.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , kcodecs, kconfig, kcoreaddons, kwindowsystem
 , libdbusmenu
 , phonon
@@ -9,7 +9,7 @@
 kdeFramework {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];

pkgs/development/libraries/kde-frameworks/knotifyconfig.nix

@@ -1,10 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+{ kdeFramework, lib, ecm, kcompletion, kconfig
 , ki18n, kio, phonon
 }:
 
 kdeFramework {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
 }

pkgs/development/libraries/kde-frameworks/kpackage/default.nix

@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
+, ecm
 , karchive
 , kconfig
 , kcoreaddons
@@ -10,7 +10,7 @@
 kdeFramework {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

pkgs/development/libraries/kde-frameworks/kparts.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ kdeFramework, lib, ecm, kconfig, kcoreaddons
 , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
 , ktextwidgets, kwidgetsaddons, kxmlgui
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
     kservice ktextwidgets kwidgetsaddons kxmlgui

pkgs/development/libraries/kde-frameworks/kpeople.nix

@@ -1,11 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
+{ kdeFramework, lib, ecm, kcoreaddons, ki18n
 , kitemviews, kservice, kwidgetsaddons, qtdeclarative
 }:
 
 kdeFramework {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];

pkgs/development/libraries/kde-frameworks/kplotting.nix

@@ -1,9 +1,9 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 }:
 
 kdeFramework {
   name = "kplotting";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kpty.nix

@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+{ kdeFramework, lib, ecm, kcoreaddons, ki18n }:
 
 kdeFramework {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
 }

pkgs/development/libraries/kde-frameworks/kross.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
+{ kdeFramework, lib, ecm, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
 , kxmlgui, qtscript
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
     qtscript

pkgs/development/libraries/kde-frameworks/krunner.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ kdeFramework, lib, ecm, kconfig, kcoreaddons
 , ki18n, kio, kservice, plasma-framework, solid
 , threadweaver
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kconfig kcoreaddons ki18n kio kservice plasma-framework solid
     threadweaver

pkgs/development/libraries/kde-frameworks/ktextwidgets.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+{ kdeFramework, lib, ecm, kcompletion, kconfig
 , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
 , sonnet
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
     sonnet

pkgs/development/libraries/kde-frameworks/kunitconversion.nix

@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
+{ kdeFramework, lib, ecm, ki18n }:
 
 kdeFramework {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ ki18n ];
 }

pkgs/development/libraries/kde-frameworks/kwallet.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+{ kdeFramework, lib, ecm, kconfig, kconfigwidgets
 , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
 , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
     knotifications kservice kwidgetsaddons kwindowsystem libgcrypt

pkgs/development/libraries/kde-frameworks/kwayland.nix

@@ -1,12 +1,12 @@
 { kdeFramework
-, extra-cmake-modules
+, ecm
 , wayland
 }:
 
 kdeFramework {
   name = "kwayland";
   nativeBuildInputs = [
-    extra-cmake-modules
+    ecm
   ];
   propagatedBuildInputs = [
     wayland

pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix

@@ -1,9 +1,9 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 }:
 
 kdeFramework {
   name = "kwidgetsaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/kwindowsystem.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , qtx11extras
 }:
 
 kdeFramework {
   name = "kwindowsystem";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtx11extras ];
 }

pkgs/development/libraries/kde-frameworks/kxmlgui.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
+{ kdeFramework, lib, ecm, attica, kconfig
 , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
 , ktextwidgets, kwindowsystem, sonnet
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kxmlgui";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [
     attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
     ktextwidgets kwindowsystem sonnet

pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix

@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
+{ kdeFramework, lib, ecm, ki18n, kio }:
 
 kdeFramework {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ ki18n kio ];
 }

pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , modemmanager
 }:
 
 kdeFramework {
   name = "modemmanager-qt";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ modemmanager ];
 }

pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , networkmanager
 }:
 
 kdeFramework {
   name = "networkmanager-qt";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ networkmanager ];
 }

pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix

@@ -1,6 +1,6 @@
 { kdeFramework
 , lib
-, extra-cmake-modules
+, ecm
 }:
 
 kdeFramework {
@@ -10,5 +10,5 @@ kdeFramework {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   outputs = [ "out" ];
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
 }

pkgs/development/libraries/kde-frameworks/plasma-framework.nix

@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
+{ kdeFramework, lib, ecm, kactivities, karchive
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
 , knotifications, kpackage, kservice, kwindowsystem, kxmlgui
@@ -8,7 +8,7 @@
 kdeFramework {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ ecm kdoctools ];
   propagatedBuildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications

pkgs/development/libraries/kde-frameworks/solid.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , qtdeclarative
 }:
 
 kdeFramework {
   name = "solid";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   propagatedBuildInputs = [ qtdeclarative ];
 }

pkgs/development/libraries/kde-frameworks/sonnet.nix

@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 , hunspell
 }:
 
 kdeFramework {
   name = "sonnet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   buildInputs = [ hunspell ];
 }

pkgs/development/libraries/kde-frameworks/threadweaver.nix

@@ -1,9 +1,9 @@
 { kdeFramework, lib
-, extra-cmake-modules
+, ecm
 }:
 
 kdeFramework {
   name = "threadweaver";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ ecm ];
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
 }