From b390eb39ae3ac1842f90c445b8436707842a6cce Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 30 Jul 2016 09:36:52 -0500 Subject: kde5: fix extra-cmake-modules hooks --- pkgs/desktops/kde-5/applications/default.nix | 4 ++-- pkgs/desktops/kde-5/applications/kde-app.nix | 6 +----- pkgs/desktops/kde-5/applications/okular.nix | 4 ++-- pkgs/desktops/kde-5/plasma/bluedevil.nix | 4 ++-- pkgs/desktops/kde-5/plasma/breeze-gtk.nix | 4 ++-- pkgs/desktops/kde-5/plasma/breeze-qt5.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kde-cli-tools.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kdecoration.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kgamma5.nix | 4 ++-- pkgs/desktops/kde-5/plasma/khotkeys.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kinfocenter.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kmenuedit.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kscreen.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kscreenlocker.nix | 4 ++-- pkgs/desktops/kde-5/plasma/ksshaskpass.nix | 4 ++-- pkgs/desktops/kde-5/plasma/ksysguard.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kwayland-integration.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kwin/default.nix | 4 ++-- pkgs/desktops/kde-5/plasma/kwrited.nix | 4 ++-- pkgs/desktops/kde-5/plasma/libkscreen.nix | 4 ++-- pkgs/desktops/kde-5/plasma/libksysguard/default.nix | 4 ++-- pkgs/desktops/kde-5/plasma/milou.nix | 4 ++-- pkgs/desktops/kde-5/plasma/oxygen.nix | 4 ++-- pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix | 4 ++-- pkgs/desktops/kde-5/plasma/plasma-integration.nix | 4 ++-- pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix | 4 ++-- pkgs/desktops/kde-5/plasma/plasma-nm/default.nix | 4 ++-- pkgs/desktops/kde-5/plasma/plasma-pa.nix | 4 ++-- .../kde-5/plasma/plasma-workspace-wallpapers.nix | 4 ++-- .../desktops/kde-5/plasma/plasma-workspace/default.nix | 4 ++-- pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix | 4 ++-- pkgs/desktops/kde-5/plasma/powerdevil.nix | 4 ++-- pkgs/desktops/kde-5/plasma/systemsettings.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/attica.nix | 10 +++------- pkgs/development/libraries/kde-frameworks/baloo.nix | 8 +++----- pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 8 +++----- .../libraries/kde-frameworks/breeze-icons.nix | 8 +++----- pkgs/development/libraries/kde-frameworks/default.nix | 8 ++------ .../libraries/kde-frameworks/frameworkintegration.nix | 4 ++-- .../libraries/kde-frameworks/kactivities-stats.nix | 5 ++--- .../libraries/kde-frameworks/kactivities.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kapidox.nix | 7 ++----- pkgs/development/libraries/kde-frameworks/karchive.nix | 6 ++---- .../libraries/kde-frameworks/kauth/default.nix | 8 ++------ .../libraries/kde-frameworks/kbookmarks.nix | 13 ++++--------- .../libraries/kde-frameworks/kcmutils/default.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kcodecs.nix | 10 +++------- .../libraries/kde-frameworks/kcompletion.nix | 8 ++------ pkgs/development/libraries/kde-frameworks/kconfig.nix | 6 ++---- .../kde-frameworks/kconfigwidgets/default.nix | 11 +++++++---- .../libraries/kde-frameworks/kcoreaddons.nix | 7 ++----- pkgs/development/libraries/kde-frameworks/kcrash.nix | 9 ++------- .../libraries/kde-frameworks/kdbusaddons.nix | 7 ++----- .../libraries/kde-frameworks/kdeclarative.nix | 10 +++++----- pkgs/development/libraries/kde-frameworks/kded.nix | 18 +++++++----------- .../kde-frameworks/kdelibs4support/default.nix | 5 ++--- .../libraries/kde-frameworks/kdesignerplugin.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kdesu.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kdnssd.nix | 4 ++-- .../libraries/kde-frameworks/kdoctools/default.nix | 4 ++-- .../libraries/kde-frameworks/kemoticons.nix | 4 ++-- .../libraries/kde-frameworks/kfilemetadata/default.nix | 4 ++-- .../libraries/kde-frameworks/kglobalaccel.nix | 4 ++-- .../libraries/kde-frameworks/kguiaddons.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/khtml.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/ki18n.nix | 4 ++-- .../libraries/kde-frameworks/kiconthemes/default.nix | 4 ++-- .../development/libraries/kde-frameworks/kidletime.nix | 4 ++-- .../libraries/kde-frameworks/kimageformats.nix | 4 ++-- .../libraries/kde-frameworks/kinit/default.nix | 4 ++-- .../libraries/kde-frameworks/kio/default.nix | 4 ++-- .../libraries/kde-frameworks/kitemmodels.nix | 4 ++-- .../libraries/kde-frameworks/kitemviews.nix | 4 ++-- .../libraries/kde-frameworks/kjobwidgets.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kjs.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kjsembed.nix | 4 ++-- .../libraries/kde-frameworks/kmediaplayer.nix | 4 ++-- .../development/libraries/kde-frameworks/knewstuff.nix | 4 ++-- .../libraries/kde-frameworks/knotifications.nix | 4 ++-- .../libraries/kde-frameworks/knotifyconfig.nix | 4 ++-- .../libraries/kde-frameworks/kpackage/default.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kparts.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kpeople.nix | 4 ++-- .../development/libraries/kde-frameworks/kplotting.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kpty.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kross.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/krunner.nix | 4 ++-- .../libraries/kde-frameworks/ktextwidgets.nix | 4 ++-- .../libraries/kde-frameworks/kunitconversion.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kwallet.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kwayland.nix | 4 ++-- .../libraries/kde-frameworks/kwidgetsaddons.nix | 4 ++-- .../libraries/kde-frameworks/kwindowsystem.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/kxmlgui.nix | 4 ++-- .../libraries/kde-frameworks/kxmlrpcclient.nix | 4 ++-- .../libraries/kde-frameworks/modemmanager-qt.nix | 4 ++-- .../libraries/kde-frameworks/networkmanager-qt.nix | 4 ++-- .../libraries/kde-frameworks/oxygen-icons5.nix | 4 ++-- .../libraries/kde-frameworks/plasma-framework.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/solid.nix | 4 ++-- pkgs/development/libraries/kde-frameworks/sonnet.nix | 4 ++-- .../libraries/kde-frameworks/threadweaver.nix | 4 ++-- 105 files changed, 229 insertions(+), 285 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index c980d4f7d20..609901048ee 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -21,9 +21,9 @@ let packages = self: with self; { kdeApp = import ./kde-app.nix { - inherit kdeDerivation lib; + inherit lib; inherit debug srcs; - inherit (pkgs) cmake pkgconfig; + inherit kdeDerivation; }; kdelibs = callPackage ./kdelibs { diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/desktops/kde-5/applications/kde-app.nix index a167eeb4636..92fdb439330 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, cmake, pkgconfig }: +{ kdeDerivation, lib, debug, srcs }: args: @@ -16,10 +16,6 @@ kdeDerivation (args // { ++ [ "-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/okular.nix b/pkgs/desktops/kde-5/applications/okular.nix index 339b7c8a9a3..6e6f1407c55 100644 --- a/pkgs/desktops/kde-5/applications/okular.nix +++ b/pkgs/desktops/kde-5/applications/okular.nix @@ -1,11 +1,11 @@ { - stdenv, lib, + kdeApp, lib, automoc4, cmake, perl, pkgconfig, kdelibs, qimageblitz, poppler_qt4, libspectre, libkexiv2, djvulibre, libtiff, freetype, ebook_tools }: -stdenv.mkDerivation { +kdeApp { name = "okular"; nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; buildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/kde-5/plasma/bluedevil.nix index 3bfac828084..677a6ce961b 100644 --- a/pkgs/desktops/kde-5/plasma/bluedevil.nix +++ b/pkgs/desktops/kde-5/plasma/bluedevil.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons +{ plasmaPackage, ecm, bluez-qt, kcoreaddons , kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications , kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework , qtdeclarative, shared_mime_info @@ -7,7 +7,7 @@ plasmaPackage { name = "bluedevil"; nativeBuildInputs = [ - extra-cmake-modules makeQtWrapper shared_mime_info + ecm makeQtWrapper shared_mime_info ]; propagatedBuildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix index 179f15dc876..664387de170 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-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix index f641b48c82b..a909e5067f4 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/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix index 282e58ecf9e..bb90fd6d3ab 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 d95db120dec..e6216650c8a 100644 --- a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix +++ b/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix @@ -1,11 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig +{ plasmaPackage, ecm, kcmutils, kconfig , kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes , kwindowsystem, makeQtWrapper, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; propagatedBuildInputs = [ kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu kiconthemes 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 f482f2a6a3f..10e55f0d698 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 eb65f7f90af..a0f9d93e60b 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 3371e17beaf..a2805f5d804 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 965c33e6eef..70d7cc17a1c 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 1666692c928..760a2a4ee37 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 c6a86fc05f6..1d2918ae27b 100644 --- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix +++ b/pkgs/desktops/kde-5/plasma/kinfocenter.nix @@ -1,4 +1,4 @@ -{ 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 @@ -8,7 +8,7 @@ plasmaPackage { name = "kinfocenter"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools makeQtWrapper ]; diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/kde-5/plasma/kmenuedit.nix index 09224a48716..377f39076d9 100644 --- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix +++ b/pkgs/desktops/kde-5/plasma/kmenuedit.nix @@ -1,11 +1,11 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui +{ plasmaPackage, ecm, kdoctools, ki18n, kxmlgui , kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper }: plasmaPackage { name = "kmenuedit"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools makeQtWrapper ]; diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/kde-5/plasma/kscreen.nix index 117a39c3be3..28e0f7af33d 100644 --- a/pkgs/desktops/kde-5/plasma/kscreen.nix +++ b/pkgs/desktops/kde-5/plasma/kscreen.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets +{ plasmaPackage, ecm, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui , libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects }: @@ -6,7 +6,7 @@ plasmaPackage { name = "kscreen"; nativeBuildInputs = [ - extra-cmake-modules + ecm makeQtWrapper ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix index 2cb3aac0f55..9a28a800a64 100644 --- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix +++ b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, kcmutils, kcrash, kdeclarative +{ plasmaPackage, ecm, kcmutils, kcrash, kdeclarative , kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland , libXcursor, pam, plasma-framework, qtdeclarative, wayland }: @@ -6,7 +6,7 @@ plasmaPackage { name = "kscreenlocker"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix index 8fe7cecd5a8..0adfb6de238 100644 --- a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix +++ b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix @@ -1,10 +1,10 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons +{ plasmaPackage, ecm, kdoctools, kcoreaddons , ki18n, kwallet, kwidgetsaddons, makeQtWrapper }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; + nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; 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 637d539189d..44335c5fa74 100644 --- a/pkgs/desktops/kde-5/plasma/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma/ksysguard.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig +{ plasmaPackage, ecm, kdoctools, kconfig , kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff , kiconthemes, libksysguard, makeQtWrapper }: @@ -6,7 +6,7 @@ plasmaPackage { name = "ksysguard"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools makeQtWrapper ]; diff --git a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix b/pkgs/desktops/kde-5/plasma/kwayland-integration.nix index 9045227a51a..376e8ed7cbd 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 8c85981de7e..382ed3ef939 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,7 +11,7 @@ plasmaPackage { name = "kwin"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools makeQtWrapper ]; diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/kde-5/plasma/kwrited.nix index 29498e93404..8dd814f783d 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 4e04fd5ed1d..838ab6ef0e5 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 2a92d6e0af0..b6ca3dfa26d 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 43f78d9e2a9..dbf9d0b9e53 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 5a783ca6502..3c54055a633 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 3a61651644f..6b54dcd20d4 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 @@ -13,7 +13,7 @@ plasmaPackage rec { name = "plasma-desktop"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools makeQtWrapper ]; diff --git a/pkgs/desktops/kde-5/plasma/plasma-integration.nix b/pkgs/desktops/kde-5/plasma/plasma-integration.nix index 97d30dcd773..e8680fea930 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 a1e1cf8a127..1967a0b8a4e 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 0ea2ab49f55..0deef373f4f 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix @@ -1,4 +1,4 @@ -{ 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 @@ -16,7 +16,7 @@ plasmaPackage { }) ]; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools makeQtWrapper ]; diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/kde-5/plasma/plasma-pa.nix index 1712dab773d..b0ad9ac69ff 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 bc87abcad15..da2a5b59d2d 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix @@ -1,10 +1,10 @@ { plasmaPackage -, extra-cmake-modules +, ecm }: plasmaPackage { name = "plasma-workspace-wallpapers"; 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 190003ca5c7..39788a4d7c4 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, @@ -15,7 +15,7 @@ plasmaPackage { name = "plasma-workspace"; nativeBuildInputs = [ - extra-cmake-modules kdoctools + ecm kdoctools ]; buildInputs = [ baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative diff --git a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix index 68bb3a9ef3d..1016912de29 100644 --- a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix +++ b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix @@ -1,5 +1,5 @@ { plasmaPackage -, extra-cmake-modules +, ecm , ki18n , kwindowsystem , kdbusaddons @@ -15,7 +15,7 @@ plasmaPackage { name = "polkit-kde-agent"; nativeBuildInputs = [ - extra-cmake-modules + ecm ]; propagatedBuildInputs = [ kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes diff --git a/pkgs/desktops/kde-5/plasma/powerdevil.nix b/pkgs/desktops/kde-5/plasma/powerdevil.nix index cbb2b9b019f..ba08fa86ef0 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 @@ -7,7 +7,7 @@ plasmaPackage { name = "powerdevil"; nativeBuildInputs = [ - extra-cmake-modules + ecm kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/kde-5/plasma/systemsettings.nix index ad17744b84f..1e1c396a44d 100644 --- a/pkgs/desktops/kde-5/plasma/systemsettings.nix +++ b/pkgs/desktops/kde-5/plasma/systemsettings.nix @@ -1,12 +1,12 @@ { - plasmaPackage, extra-cmake-modules, kdoctools, 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 ]; + nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; propagatedBuildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 98721876c12..d34b3f3a2c5 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 825a125c8a7..9c803fdc717 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/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 ]; - }; } diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 26490167dbd..7ab82bdc1ef 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/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 ]; - }; } diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 258955c2a94..bf6df87a972 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index c6f8b120b8d..49ece732222 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/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 { diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index ee1b188d407..0a782ae177d 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 0080c5c3164..4f406376faa 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 167c3f15bbd..a2cacd4b257 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index f78a5ea08a4..f6c60b7731e 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index bec44a6d687..265df45800f 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 4bdba88bc3b..f2a1c7717d5 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/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); } diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 7348e591d9c..50cec5a39c8 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index fdf55174548..dd1af737d68 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 53a69a69b69..a3fcd3023f5 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index 8c45bed2585..893f374933e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 154329d0e98..0f003f8ea97 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index f507abe2991..b88308b634c 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/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" diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 94b4136df3d..a3d5735ad27 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 133a81c60c1..2fcadc828cf 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index eadd645fb99..66320051660 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 8db1b73c91a..a90a419d9b8 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index fd286accb9f..d8fe820518d 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/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 + ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 1765ffa9a39..f3fd315e550 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 8e17a1a60c8..e87bb5bf9d0 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix index fcccea9161f..0c5cb85cc49 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 8fda4e63e3a..49fd368fccb 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 99fc4c7d023..4a31ea5396d 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/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 = [ diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 1e31277172d..cdffbd50357 100644 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index bc7349e7453..31f692deca6 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 4743d0b8f1b..8ac0adafbd1 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6ebfd1104f7..9f20ecd598a 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 99f6fe31e0d..be1094b7cf5 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 2698a97fd33..cf2212413bd 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 6102bb0d4b5..6141db849ef 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 758260517e7..d3f46512db2 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index fbc8d092f86..ec22dc335d5 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/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"; } diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index b965f761e92..032bdd30d9e 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index cb67c845903..7623e44a076 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 7dff10b7fe0..0a474dfdb7d 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 77f4b662160..0af3de5770a 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 2692458b8be..1337f4109c2 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index abdc15ce8df..12852e6a1e7 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index 95bc02422f1..20c8b2eea16 100644 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 93a6b450f76..360d8e90daf 100644 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index 002418c65ad..b6a84e2539d 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 7196832495f..061a5d8d142 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 0e357aecb99..b64f109f08b 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index a39a672574b..76ab7dbe013 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/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); } diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index ad6ea2dbc30..a46fa210b27 100644 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 6acb5e2eed5..4ca9bc7fdbf 100644 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/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 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 601f1778db7..6eda06445dc 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 8bdaacb85f8..d42f96fb92c 100644 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index 0e66d95b5cc..ae098654eb1 100644 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index ec9ab7abe9f..064a89e0806 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 25954c60397..3a1258e9a37 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index c04ded722aa..136587cc682 100644 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index f02c6138df7..fb801f48b11 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index db332841308..c530bf80a90 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 7f2b35d8f7b..ae34e60c4c1 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix index 6acab52d135..64186a30ead 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index ea800bf58ae..c48fc9efdfa 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index f20f4a22394..31301875351 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index e03254a71ed..bf3487dcb39 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 0515509a77c..bb596863538 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 0b5c75b960d..42978b46992 100644 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index a4138148653..60910b0d678 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/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 diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index c4f580fe1c2..aad6e5eb601 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 28c24302abc..8b1cf6a2cd1 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/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 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index b8f2939e8b5..6d3dff60413 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/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 ]; }; } -- cgit 1.4.1