diff options
Diffstat (limited to 'pkgs/desktops/kde-5/plasma')
33 files changed, 66 insertions, 66 deletions
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 |