diff options
Diffstat (limited to 'pkgs/applications/kde')
37 files changed, 76 insertions, 74 deletions
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix index 7acfa3a230b34..830c9e6899ea5 100644 --- a/pkgs/applications/kde/akonadi-contacts.nix +++ b/pkgs/applications/kde/akonadi-contacts.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, + extra-cmake-modules, akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine, akonadi }: @@ -11,7 +11,7 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine ]; diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix index 26e1559c779e9..ba4b4b50242cd 100644 --- a/pkgs/applications/kde/akonadi-mime.nix +++ b/pkgs/applications/kde/akonadi-mime.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, + extra-cmake-modules, akonadi, kdbusaddons, kio, kitemmodels, kmime }: @@ -10,6 +10,6 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ]; } diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix index 03483e5ec0d15..284ed60a9cbd2 100644 --- a/pkgs/applications/kde/akonadi.nix +++ b/pkgs/applications/kde/akonadi.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, + extra-cmake-modules, kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes, kio, boost, kitemmodels @@ -12,7 +12,7 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio ]; diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 6b471614f5a6a..f3adf1828de9b 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -1,7 +1,7 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, makeWrapper, + extra-cmake-modules, kdoctools, makeWrapper, karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio, kservice, kpty, kwidgetsaddons, libarchive, @@ -15,7 +15,7 @@ let kdeApp { name = "ark"; nativeBuildInputs = [ - ecm kdoctools makeWrapper + extra-cmake-modules kdoctools makeWrapper ]; propagatedBuildInputs = [ khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix index f6f3a7ce14ea1..bb6803057096b 100644 --- a/pkgs/applications/kde/baloo-widgets.nix +++ b/pkgs/applications/kde/baloo-widgets.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, kdoctools, + extra-cmake-modules, kdoctools, baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice }: @@ -10,7 +10,7 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice ]; diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix index e9932adc5dcaa..7f436c7a55a9c 100644 --- a/pkgs/applications/kde/dolphin-plugins.nix +++ b/pkgs/applications/kde/dolphin-plugins.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, kdoctools, + extra-cmake-modules, kdoctools, dolphin, kdelibs4support, ki18n, kio, kxmlgui }: @@ -10,7 +10,7 @@ kdeApp { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ dolphin.unwrapped kdelibs4support ki18n kio kxmlgui ]; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 9be40e9439b64..6515c230c2848 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, makeQtWrapper, + extra-cmake-modules, kdoctools, makeQtWrapper, baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils, kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, @@ -15,7 +15,7 @@ let license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools makeQtWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; propagatedBuildInputs = [ baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix index c063b1e6035b9..5dde6d8a64ea0 100644 --- a/pkgs/applications/kde/ffmpegthumbs.nix +++ b/pkgs/applications/kde/ffmpegthumbs.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, + extra-cmake-modules, ffmpeg, kio }: @@ -10,6 +10,6 @@ kdeApp { license = with lib.licenses; [ gpl2 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ffmpeg kio ]; } diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index e3d9172145c85..71ab51320ab1f 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kio, kparts, kxmlgui, qtscript, solid }: @@ -12,7 +12,7 @@ let license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh vcunat ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kio kparts kxmlgui qtscript solid ]; diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 37a1605fe70a2..0fa06ed0fbe2b 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2, libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras }: @@ -13,7 +13,7 @@ let license = with lib.licenses; [ gpl2 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw libkipi phonon qtimageformats qtsvg qtx11extras diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index 03cc0e1fe33b4..cd320afd8d3bc 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2, @@ -15,7 +15,7 @@ let license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix index 10164692f770f..8ec7591460e76 100644 --- a/pkgs/applications/kde/kcalc.nix +++ b/pkgs/applications/kde/kcalc.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp }: @@ -12,7 +12,7 @@ let license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.fridh ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ gmp kconfig kconfigwidgets kguiaddons kinit knotifications ]; diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix index 1dc6ccbc44c47..c1266009b686c 100644 --- a/pkgs/applications/kde/kcolorchooser.nix +++ b/pkgs/applications/kde/kcolorchooser.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, ki18n, kwidgetsaddons, kxmlgui + extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui }: let @@ -11,7 +11,7 @@ let license = with lib.licenses; [ mit ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; }; in diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix index 441d73d363d9e..5143df60ef441 100644 --- a/pkgs/applications/kde/kcontacts.nix +++ b/pkgs/applications/kde/kcontacts.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, ki18n, + extra-cmake-modules, ki18n, kcoreaddons, kconfig, kcodecs }: @@ -10,6 +10,6 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ki18n ]; + nativeBuildInputs = [ extra-cmake-modules ki18n ]; buildInputs = [ kcoreaddons kconfig kcodecs ]; } diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix index 2b9cc0e35eb0e..772ebe37e44f1 100644 --- a/pkgs/applications/kde/kde-locale-5.nix +++ b/pkgs/applications/kde/kde-locale-5.nix @@ -1,6 +1,6 @@ name: args: -{ kdeApp, cmake, ecm, gettext, kdoctools }: +{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }: kdeApp (args // { sname = "kde-l10n-${name}"; @@ -9,7 +9,7 @@ kdeApp (args // { outputs = [ "out" ]; nativeBuildInputs = - [ cmake ecm gettext kdoctools ] + [ cmake extra-cmake-modules gettext kdoctools ] ++ (args.nativeBuildInputs or []); preConfigure = '' diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix index 984524dc1b2b4..e50c92f888488 100644 --- a/pkgs/applications/kde/kdegraphics-mobipocket.nix +++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, + extra-cmake-modules, kio }: @@ -10,6 +10,6 @@ kdeApp { license = [ lib.licenses.gpl2Plus ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kio ]; } diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index c3947226690f2..5aa974a9c9609 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, kio, libkexiv2, libkdcraw + extra-cmake-modules, kio, libkexiv2, libkdcraw }: kdeApp { @@ -9,6 +9,6 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kio libkexiv2 libkdcraw ]; } diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 4aa1196752854..20f81563c3b4f 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kcoreaddons, ki18n, kio, kwidgetsaddons, samba }: @@ -10,6 +10,6 @@ kdeApp { license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ]; } diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix index c73eadc1df449..97e74eb2e1257 100644 --- a/pkgs/applications/kde/kdf.nix +++ b/pkgs/applications/kde/kdf.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kcmutils }: @@ -12,7 +12,7 @@ let license = with lib.licenses; [ gpl2 ]; maintainers = [ lib.maintainers.peterhoeg ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kcmutils ]; diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix index cd462acdf2b09..c442859822932 100644 --- a/pkgs/applications/kde/kgpg.nix +++ b/pkgs/applications/kde/kgpg.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, kdoctools, ki18n, + extra-cmake-modules, kdoctools, ki18n, akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice, ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem @@ -8,7 +8,7 @@ kdeApp { name = "kgpg"; - nativeBuildInputs = [ ecm kdoctools ki18n ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ]; buildInputs = [ akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index 3f13d131c77aa..0579faa72a018 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -1,6 +1,6 @@ { kdeApp, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support, khtml, kservice, xapian }: @@ -9,7 +9,7 @@ let unwrapped = kdeApp { name = "khelpcenter"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils kservice xapian diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix index 9636f82974b3c..9f38079316fae 100644 --- a/pkgs/applications/kde/kig.nix +++ b/pkgs/applications/kde/kig.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper - , ecm, kdoctools, kparts + , extra-cmake-modules, kdoctools, kparts , qtsvg, qtxmlpatterns, ktexteditor, boost }: @@ -12,7 +12,7 @@ let license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ raskin ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kparts qtsvg qtxmlpatterns ktexteditor boost ]; diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix index fe3e3fad200b3..77f795167fc0b 100644 --- a/pkgs/applications/kde/kio-extras.nix +++ b/pkgs/applications/kde/kio-extras.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, ecm, kdoctools, shared_mime_info, + kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info, exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml, kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon, @@ -12,7 +12,7 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools shared_mime_info ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; propagatedBuildInputs = [ exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index d60909ec7bc94..c17b3fdcd8e99 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -1,6 +1,6 @@ { kdeApp, lib, - ecm, ki18n, + extra-cmake-modules, ki18n, kcodecs }: @@ -10,6 +10,6 @@ kdeApp { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ki18n ]; + nativeBuildInputs = [ extra-cmake-modules ki18n ]; buildInputs = [ kcodecs ]; } diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix index 46a67e06ee0b9..6ab653cfce06e 100644 --- a/pkgs/applications/kde/kmix.nix +++ b/pkgs/applications/kde/kmix.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support, plasma-framework, libpulseaudio, alsaLib, libcanberra_kde }: @@ -13,7 +13,7 @@ let license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.rongcuid ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libpulseaudio alsaLib libcanberra_kde ]; propagatedBuildInputs = [ kglobalaccel kxmlgui kcoreaddons kdelibs4support diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index 45789edbfcc8c..660090dc84aef 100644 --- a/pkgs/applications/kde/kompare.nix +++ b/pkgs/applications/kde/kompare.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kparts, ktexteditor, kwidgetsaddons, libkomparediff2 }: @@ -9,7 +9,7 @@ let kdeApp { name = "kompare"; meta = { license = with lib.licenses; [ gpl2 ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kparts ktexteditor kwidgetsaddons libkomparediff2 ]; diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 2dfd305b46b25..15b6373bdb023 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, @@ -15,7 +15,7 @@ let license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix index 03c2ab3853a18..afa870d90a544 100644 --- a/pkgs/applications/kde/kwalletmanager.nix +++ b/pkgs/applications/kde/kwalletmanager.nix @@ -1,7 +1,7 @@ { lib , kdeApp , kdeWrapper -, ecm +, extra-cmake-modules , kdoctools , kauth , kcmutils @@ -19,7 +19,7 @@ let license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kauth kcmutils diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix index 421f7dbb4cfe7..179e9f414dc32 100644 --- a/pkgs/applications/kde/libkdcraw.nix +++ b/pkgs/applications/kde/libkdcraw.nix @@ -1,4 +1,4 @@ -{ kdeApp, lib, ecm, libraw }: +{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }: kdeApp { name = "libkdcraw"; @@ -6,6 +6,7 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ libraw ]; } diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix index 0fac0759ab6b0..0991c5df5ab49 100644 --- a/pkgs/applications/kde/libkexiv2.nix +++ b/pkgs/applications/kde/libkexiv2.nix @@ -1,4 +1,4 @@ -{ kdeApp, lib, exiv2, ecm }: +{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }: kdeApp { name = "libkexiv2"; @@ -6,6 +6,7 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase ]; propagatedBuildInputs = [ exiv2 ]; } diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix index fa9dcc8323d1e..32eeb171ff891 100644 --- a/pkgs/applications/kde/libkipi.nix +++ b/pkgs/applications/kde/libkipi.nix @@ -1,4 +1,4 @@ -{ kdeApp, lib, ecm, kconfig, ki18n, kservice, kxmlgui }: +{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }: kdeApp { name = "libkipi"; @@ -6,6 +6,6 @@ kdeApp { license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ]; } diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix index 91b469fed3c7f..aacc89a0efe3e 100644 --- a/pkgs/applications/kde/libkomparediff2.nix +++ b/pkgs/applications/kde/libkomparediff2.nix @@ -1,7 +1,7 @@ -{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }: +{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }: kdeApp { name = "libkomparediff2"; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ]; } diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index 5b8a82dbf0984..c151396f24767 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,5 +1,5 @@ { kdeApp, lib, kdeWrapper -, ecm, qtscript, qtsvg, qtquickcontrols +, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols , gpsd }: @@ -9,7 +9,7 @@ let name = "marble"; meta.license = with lib.licenses; [ lgpl21 gpl3 ]; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtscript qtsvg qtquickcontrols gpsd diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix index 6683b9876fcbe..59520e285327f 100644 --- a/pkgs/applications/kde/okteta.nix +++ b/pkgs/applications/kde/okteta.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kconfig, kinit, kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5 }: @@ -13,7 +13,7 @@ let license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ peterhoeg ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5 diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 499e8cc93681c..f5b3e38ca7c73 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2, @@ -10,7 +10,7 @@ let unwrapped = kdeApp { name = "okular"; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index c4a82780b4483..0a3d311eb27ab 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -1,5 +1,5 @@ { - kdeApp, lib, ecm, + kdeApp, lib, extra-cmake-modules, cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio, knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework, qtdeclarative @@ -11,7 +11,7 @@ kdeApp { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index 4c3a5246b2e73..30abfc23e834f 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -1,6 +1,6 @@ { kdeApp, lib, kdeWrapper, - ecm, kdoctools, + extra-cmake-modules, kdoctools, kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, xcb-util-cursor @@ -11,7 +11,7 @@ let kdeApp { name = "spectacle"; meta = with lib; { maintainers = with maintainers; [ ttuegel ]; }; - nativeBuildInputs = [ ecm kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor |