diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-26 06:49:15 -0600 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-02-27 11:49:46 -0600 |
commit | 127bf18a350afa562cad3f8cb3b2f626edd23de0 (patch) | |
tree | 3edc31bedef41e96f6a7f5062fb26e3950671a59 /pkgs/desktops/plasma-5 | |
parent | b39e491eb521d93ae983bc63b10efad3d147a9cd (diff) |
extra-cmake-modules: Lift Qt dependency
Diffstat (limited to 'pkgs/desktops/plasma-5')
34 files changed, 71 insertions, 68 deletions
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 1deef241a62f..d0e784998132 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,12 +1,12 @@ { - plasmaPackage, ecm, shared_mime_info, + plasmaPackage, extra-cmake-modules, shared_mime_info, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative }: plasmaPackage { name = "bluedevil"; - nativeBuildInputs = [ ecm shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; propagatedBuildInputs = [ bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix index 57de2fa2d474..4048d98431db 100644 --- a/pkgs/desktops/plasma-5/breeze-gtk.nix +++ b/pkgs/desktops/plasma-5/breeze-gtk.nix @@ -1,9 +1,11 @@ { plasmaPackage -, ecm +, extra-cmake-modules +, qtbase }: plasmaPackage { name = "breeze-gtk"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 0de1ca1f6802..dfbdf48165aa 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -1,12 +1,12 @@ { plasmaPackage, lib, copyPathsToStore, - ecm, + extra-cmake-modules, plymouth }: plasmaPackage { name = "breeze-plymouth"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plymouth ]; outputs = [ "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index ea2776a13c59..a1b64a4656cb 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -1,6 +1,6 @@ { plasmaPackage, - ecm, + extra-cmake-modules, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras }: @@ -8,7 +8,7 @@ plasmaPackage { name = "breeze-qt5"; sname = "breeze"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index bb90fd6d3ab0..282e58ecf9e6 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,12 +1,12 @@ { plasmaPackage -, ecm +, extra-cmake-modules , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel , kwindowsystem, kxmlgui }: plasmaPackage { name = "kactivitymanagerd"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem kxmlgui diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 33a7340cb85f..87a46703997a 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,12 +1,12 @@ { - plasmaPackage, ecm, + plasmaPackage, extra-cmake-modules, kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes, kwindowsystem, qtsvg, qtx11extras }: plasmaPackage { name = "kde-cli-tools"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg qtx11extras diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 10e55f0d6980..f482f2a6a3f3 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -1,5 +1,5 @@ { plasmaPackage -, ecm +, extra-cmake-modules , glib , gtk2 , gtk3 @@ -15,7 +15,7 @@ plasmaPackage { name = "kde-gtk-config"; patches = [ ./0001-follow-symlinks.patch ]; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes knewstuff diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index a0f9d93e60b0..546f72c3f384 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,6 +1,7 @@ -{ plasmaPackage, ecm }: +{ plasmaPackage, extra-cmake-modules, qtbase }: plasmaPackage { name = "kdecoration"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; } diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index a2805f5d804b..3371e17beaf8 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, ecm, kdoctools +{ plasmaPackage, extra-cmake-modules, 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 = [ - ecm + extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index 70d7cc17a1ca..965c33e6eef8 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, ecm, kdoctools, kdelibs4support +{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support , qtx11extras }: plasmaPackage { name = "kgamma5"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kdelibs4support qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index f23a17e5479e..5360f6cf0b7c 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, ecm, kdoctools, kcmutils +{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui , plasma-framework, plasma-workspace, qtx11extras , fetchpatch @@ -6,7 +6,7 @@ plasmaPackage { name = "khotkeys"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; patches = [ # Patch is in 5.9 and up. diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index 939e4fa62a9c..b4c8dc99adcb 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,6 +1,6 @@ { plasmaPackage, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid @@ -8,7 +8,7 @@ plasmaPackage { name = "kinfocenter"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix index f10bf6bb3cdd..a27dc5dd92a8 100644 --- a/pkgs/desktops/plasma-5/kmenuedit.nix +++ b/pkgs/desktops/plasma-5/kmenuedit.nix @@ -1,13 +1,13 @@ { plasmaPackage, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui, sonnet }: plasmaPackage { name = "kmenuedit"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet ]; diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index ecbd88c2146d..e0fbea5d7467 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -1,11 +1,11 @@ -{ plasmaPackage, ecm, kconfig, kconfigwidgets +{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui , libkscreen, qtdeclarative, qtgraphicaleffects }: plasmaPackage { name = "kscreen"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index 3c5d7b374724..3551feab76fc 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,13 +1,13 @@ { plasmaPackage, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland }: plasmaPackage { name = "kscreenlocker"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland libXcursor pam plasma-framework qtdeclarative wayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 80b529a66685..f1a6b82ae93c 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, ecm, kdoctools, kcoreaddons +{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons , ki18n, kwallet, kwidgetsaddons }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; } diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index f7e5cced708a..366b154cae70 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,6 +1,6 @@ { plasmaPackage, - ecm, kdoctools, + extra-cmake-modules, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, knewstuff, libksysguard, qtwebkit @@ -8,7 +8,7 @@ plasmaPackage { name = "ksysguard"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ lm_sensors ]; propagatedBuildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 86ba52292f9e..2789499c50a2 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,10 +1,10 @@ -{ plasmaPackage, ecm, pam, socat, libgcrypt +{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt }: plasmaPackage { name = "kwallet-pam"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ pam socat libgcrypt ]; diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 376e8ed7cbda..9045227a51a9 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,5 +1,5 @@ { plasmaPackage -, ecm +, extra-cmake-modules , kidletime , kwayland , kwindowsystem @@ -8,7 +8,7 @@ plasmaPackage { name = "kwayland-integration"; nativeBuildInputs = [ - ecm + extra-cmake-modules ]; propagatedBuildInputs = [ kidletime kwindowsystem kwayland diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 73e40cdb114c..3555cf91e005 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,6 +1,6 @@ { plasmaPackage, lib, copyPathsToStore, - ecm, kdoctools, + extra-cmake-modules, kdoctools, breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, @@ -12,7 +12,7 @@ plasmaPackage { name = "kwin"; nativeBuildInputs = [ - ecm + extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index 8dd814f783d0..29498e93404d 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,9 +1,9 @@ -{ plasmaPackage, ecm, kcoreaddons, ki18n, kpty +{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty , knotifications, kdbusaddons }: plasmaPackage { name = "kwrited"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; } diff --git a/pkgs/desktops/plasma-5/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix index 838ab6ef0e5c..4e04fd5ed1d9 100644 --- a/pkgs/desktops/plasma-5/libkscreen.nix +++ b/pkgs/desktops/plasma-5/libkscreen.nix @@ -1,5 +1,5 @@ { plasmaPackage -, ecm +, extra-cmake-modules , kwayland, libXrandr , qtx11extras }: @@ -7,7 +7,7 @@ plasmaPackage { name = "libkscreen"; nativeBuildInputs = [ - ecm + extra-cmake-modules ]; propagatedBuildInputs = [ kwayland libXrandr qtx11extras diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 2d81d061f4c7..b67e041a7821 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,6 +1,6 @@ { plasmaPackage, - ecm, + extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras @@ -11,7 +11,7 @@ plasmaPackage { patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index dbf9d0b9e537..43f78d9e2a97 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, ecm, qtscript, qtdeclarative +{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework , krunner }: @@ -6,7 +6,7 @@ plasmaPackage { name = "milou"; nativeBuildInputs = [ - ecm + extra-cmake-modules ]; propagatedBuildInputs = [ kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index ca63c8d7a377..b4ff775264f8 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -1,6 +1,6 @@ { plasmaPackage, kdeWrapper, - ecm, + extra-cmake-modules, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras }: @@ -8,7 +8,7 @@ let unwrapped = plasmaPackage { name = "oxygen"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 21ceec25d53f..1ac257057309 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -1,6 +1,6 @@ { plasmaPackage, lib, copyPathsToStore, - ecm, kdoctools, + extra-cmake-modules, kdoctools, attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, @@ -13,7 +13,7 @@ plasmaPackage rec { name = "plasma-desktop"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff knotifications knotifyconfig kwallet libcanberra_kde libXcursor diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index e8680fea930a..97d30dcd7732 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, ecm +{ plasmaPackage, extra-cmake-modules , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland , libXcursor }: @@ -8,7 +8,7 @@ plasmaPackage { name = "plasma-integration"; nativeBuildInputs = [ - ecm + extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index b6d18dbf91d9..da57653bb083 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, substituteAll, ecm, kdoctools +{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem @@ -15,7 +15,7 @@ plasmaPackage { inherit mobile_broadband_provider_info; }) ]; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 7bf97d745fe4..f398e1a9efc0 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,6 +1,6 @@ { plasmaPackage, - ecm, + extra-cmake-modules, gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework }: @@ -8,7 +8,7 @@ plasmaPackage { name = "plasma-pa"; nativeBuildInputs = [ - ecm kdoctools + extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ gconf glib kconfigwidgets kcoreaddons kdeclarative diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix index 6ffdb17cbeab..8af9caaa5795 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix @@ -1,11 +1,11 @@ { plasmaPackage -, ecm +, extra-cmake-modules }: plasmaPackage { name = "plasma-workspace-wallpapers"; outputs = [ "out" ]; nativeBuildInputs = [ - ecm + extra-cmake-modules ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 1e38c0c74dd4..19d530da1a60 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -1,7 +1,7 @@ { plasmaPackage, lib, copyPathsToStore, - ecm, kdoctools, + extra-cmake-modules, kdoctools, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, @@ -14,7 +14,7 @@ plasmaPackage { name = "plasma-workspace"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 002c2bb10ff3..1d7d20a7ffbf 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,12 +1,12 @@ { - plasmaPackage, ecm, + plasmaPackage, extra-cmake-modules, kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, kwidgetsaddons, kwindowsystem, polkit-qt }: plasmaPackage { name = "polkit-kde-agent"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes knotifications kwindowsystem polkit-qt diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index c0c18a6eae6c..c3469cc2ebc8 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -1,4 +1,4 @@ -{ plasmaPackage, ecm, kdoctools, bluez-qt, kactivities +{ plasmaPackage, extra-cmake-modul |