diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix index 816adaaa7ed..155e024f970 100644 --- a/pkgs/applications/kde-apps-15.08/ark.nix +++ b/pkgs/applications/kde-apps-15.08/ark.nix @@ -27,7 +27,6 @@ kdeApp { kconfig kcrash kdbusaddons - ki18n kiconthemes kio kservice @@ -37,6 +36,7 @@ kdeApp { ]; propagatedBuildInputs = [ khtml + ki18n ]; meta = { license = with lib.licenses; [ gpl2 lgpl3 ]; diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix index f7edbb4b01d..6d18a2e8304 100644 --- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix +++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix @@ -20,13 +20,13 @@ kdeApp { buildInputs = [ kconfig kio - ki18n kservice ]; propagatedBuildInputs = [ baloo kdelibs4support kfilemetadata + ki18n ]; meta = { license = [ lib.licenses.lgpl21 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix index 5a3dbc2b635..578d4bf9e21 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix @@ -17,12 +17,12 @@ kdeApp { ]; buildInputs = [ kxmlgui - ki18n kio dolphin ]; propagatedBuildInputs = [ kdelibs4support + ki18n ]; meta = { license = [ lib.licenses.gpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix index b92543ed831..1c468d613f5 100644 --- a/pkgs/applications/kde-apps-15.08/dolphin.nix +++ b/pkgs/applications/kde-apps-15.08/dolphin.nix @@ -37,7 +37,6 @@ kdeApp { kcmutils kcoreaddons knewstuff - ki18n kdbusaddons kbookmarks kconfig @@ -57,6 +56,7 @@ kdeApp { kactivities kdelibs4support kfilemetadata + ki18n ]; meta = { license = with lib.licenses; [ gpl2 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix index 39db56edb05..b7ee4859dea 100644 --- a/pkgs/applications/kde-apps-15.08/kate.nix +++ b/pkgs/applications/kde-apps-15.08/kate.nix @@ -38,7 +38,6 @@ kdeApp { kcrash kguiaddons kiconthemes - ki18n kinit kjobwidgets kio @@ -57,6 +56,7 @@ kdeApp { ]; propagatedBuildInputs = [ kactivities + ki18n ]; meta = { license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix index a01e9c9adc8..4ad675c0432 100644 --- a/pkgs/applications/kde-apps-15.08/konsole.nix +++ b/pkgs/applications/kde-apps-15.08/konsole.nix @@ -39,7 +39,6 @@ kdeApp { kconfigwidgets kcoreaddons kguiaddons - ki18n kiconthemes kinit kio @@ -55,6 +54,7 @@ kdeApp { ]; propagatedBuildInputs = [ kdelibs4support + ki18n ]; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix index 909aea8e716..73c13cf49fa 100644 --- a/pkgs/applications/kde-apps-15.08/print-manager.nix +++ b/pkgs/applications/kde-apps-15.08/print-manager.nix @@ -29,7 +29,6 @@ kdeApp { kconfigwidgets kdbusaddons kiconthemes - ki18n kcmutils kio knotifications @@ -38,6 +37,9 @@ kdeApp { kwindowsystem kitemviews ]; + propagatedBuildInputs = [ + ki18n + ]; meta = { license = [ lib.licenses.gpl2 ]; maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/desktops/plasma-5.4/breeze-qt5.nix b/pkgs/desktops/plasma-5.4/breeze-qt5.nix index bf582f1a406..f526d2ebc9f 100644 --- a/pkgs/desktops/plasma-5.4/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5.4/breeze-qt5.nix @@ -10,10 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n + kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ]; + propagatedBuildInputs = [ frameworkintegration ki18n ]; cmakeFlags = [ "-DUSE_KDE4=OFF" ]; postInstall = '' wrapKDEProgram "$out/bin/breeze-settings5" diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix index 9c59665f1a0..d6a041220b2 100644 --- a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix +++ b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix @@ -16,9 +16,10 @@ plasmaPackage { name = "kde-gtk-config"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - glib gtk2 gtk3 karchive kcmutils kconfigwidgets ki18n kiconthemes + glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes kio knewstuff ]; + propagatedBuildInputs = [ ki18n ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" diff --git a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix index 9328db7ad0b..ca52d23b400 100644 --- a/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5.4/kdeplasma-addons.nix @@ -11,7 +11,7 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ibus kconfig kconfigwidgets kcoreaddons kcmutils ki18n kio + ibus kconfig kconfigwidgets kcoreaddons kcmutils kio knewstuff kross krunner kservice kunitconversion plasma-framework ]; propagatedBuildInputs = [ kdelibs4support qtdeclarative qtx11extras ]; diff --git a/pkgs/desktops/plasma-5.4/khelpcenter.nix b/pkgs/desktops/plasma-5.4/khelpcenter.nix index 5ed93f6199e..609996c3bd1 100644 --- a/pkgs/desktops/plasma-5.4/khelpcenter.nix +++ b/pkgs/desktops/plasma-5.4/khelpcenter.nix @@ -10,9 +10,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kcoreaddons kdbusaddons ki18n kinit kcmutils kservice + kconfig kcoreaddons kdbusaddons kinit kcmutils kservice ]; - propagatedBuildInputs = [ kdelibs4support khtml ]; + propagatedBuildInputs = [ kdelibs4support khtml ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/khelpcenter" ''; diff --git a/pkgs/desktops/plasma-5.4/khotkeys.nix b/pkgs/desktops/plasma-5.4/khotkeys.nix index 8dfe4c08948..484e59ac380 100644 --- a/pkgs/desktops/plasma-5.4/khotkeys.nix +++ b/pkgs/desktops/plasma-5.4/khotkeys.nix @@ -7,8 +7,8 @@ plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcmutils kdbusaddons ki18n kio kxmlgui plasma-framework + kcmutils kdbusaddons kio kxmlgui plasma-framework plasma-workspace ]; - propagatedBuildInputs = [ kdelibs4support kglobalaccel qtx11extras ]; + propagatedBuildInputs = [ kdelibs4support kglobalaccel ki18n qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/kinfocenter.nix b/pkgs/desktops/plasma-5.4/kinfocenter.nix index b76199ab521..62696505f8c 100644 --- a/pkgs/desktops/plasma-5.4/kinfocenter.nix +++ b/pkgs/desktops/plasma-5.4/kinfocenter.nix @@ -12,10 +12,10 @@ plasmaPackage { ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons ki18n kiconthemes kio kpackage kservice kwidgetsaddons + kdbusaddons kiconthemes kio kpackage kservice kwidgetsaddons kxmlgui libraw1394 pciutils solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/kinfocenter" ''; diff --git a/pkgs/desktops/plasma-5.4/kmenuedit.nix b/pkgs/desktops/plasma-5.4/kmenuedit.nix index b041d8dcedc..a7a89678e67 100644 --- a/pkgs/desktops/plasma-5.4/kmenuedit.nix +++ b/pkgs/desktops/plasma-5.4/kmenuedit.nix @@ -9,9 +9,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - ki18n kxmlgui kdbusaddons kiconthemes kio sonnet + kxmlgui kdbusaddons kiconthemes kio sonnet ]; - propagatedBuildInputs = [ kdelibs4support ]; + propagatedBuildInputs = [ kdelibs4support ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/kmenuedit" ''; diff --git a/pkgs/desktops/plasma-5.4/kscreen.nix b/pkgs/desktops/plasma-5.4/kscreen.nix index fb75548d840..7123ead146a 100644 --- a/pkgs/desktops/plasma-5.4/kscreen.nix +++ b/pkgs/desktops/plasma-5.4/kscreen.nix @@ -9,10 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons ki18n kwidgetsaddons kxmlgui + kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui libkscreen ]; - propagatedBuildInputs = [ kglobalaccel qtdeclarative ]; + propagatedBuildInputs = [ kglobalaccel ki18n qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.4/ksshaskpass.nix b/pkgs/desktops/plasma-5.4/ksshaskpass.nix index d20a44df0ac..0a68893e0bf 100644 --- a/pkgs/desktops/plasma-5.4/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5.4/ksshaskpass.nix @@ -1,24 +1,12 @@ -{ plasmaPackage -, extra-cmake-modules -, kdoctools -, kcoreaddons -, ki18n -, kwallet -, kwidgetsaddons +{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons +, ki18n, kwallet, kwidgetsaddons }: plasmaPackage { name = "ksshaskpass"; - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcoreaddons - ki18n - kwallet - kwidgetsaddons - ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; + propagatedBuildInputs = [ ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/ksshaskpass" ''; diff --git a/pkgs/desktops/plasma-5.4/ksysguard.nix b/pkgs/desktops/plasma-5.4/ksysguard.nix index d415e726d02..5f24d68bb39 100644 --- a/pkgs/desktops/plasma-5.4/ksysguard.nix +++ b/pkgs/desktops/plasma-5.4/ksysguard.nix @@ -10,10 +10,9 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kcoreaddons ki18n kitemviews knewstuff kiconthemes - libksysguard + kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard ]; - propagatedBuildInputs = [ kdelibs4support ]; + propagatedBuildInputs = [ kdelibs4support ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/ksysguardd" wrapKDEProgram "$out/bin/ksysguard" diff --git a/pkgs/desktops/plasma-5.4/kwin/default.nix b/pkgs/desktops/plasma-5.4/kwin/default.nix index 051161c399f..e2d1cd62c6d 100644 --- a/pkgs/desktops/plasma-5.4/kwin/default.nix +++ b/pkgs/desktops/plasma-5.4/kwin/default.nix @@ -15,13 +15,12 @@ plasmaPackage { ]; buildInputs = [ epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration ki18n kiconthemes kinit kio knewstuff - knotifications kpackage kservice kwayland kwidgetsaddons - kwindowsystem kxmlgui libinput libICE libSM plasma-framework - qtdeclarative qtscript qtx11extras udev wayland - xcb-util-cursor + kcrash kdecoration kiconthemes kinit kio knewstuff knotifications + kpackage kservice kwayland kwidgetsaddons kwindowsystem kxmlgui + libinput libICE libSM plasma-framework qtdeclarative qtscript + qtx11extras udev wayland xcb-util-cursor ]; - propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ]; + propagatedBuildInputs = [ kactivities kdeclarative kglobalaccel ki18n ]; patches = [ ./kwin-import-plugin-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kwin_x11" diff --git a/pkgs/desktops/plasma-5.4/kwrited.nix b/pkgs/desktops/plasma-5.4/kwrited.nix index afd69073227..a6ed9d9bb28 100644 --- a/pkgs/desktops/plasma-5.4/kwrited.nix +++ b/pkgs/desktops/plasma-5.4/kwrited.nix @@ -1,22 +1,10 @@ -{ plasmaPackage -, extra-cmake-modules -, kcoreaddons -, ki18n -, kpty -, knotifications -, kdbusaddons +{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty +, knotifications, kdbusaddons }: plasmaPackage { name = "kwrited"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kcoreaddons - ki18n - kpty - knotifications - kdbusaddons - ]; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ]; + propagatedBuildInputs = [ ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/libkscreen/default.nix b/pkgs/desktops/plasma-5.4/libkscreen/default.nix index 8f5212e76c8..9fccbd6834c 100644 --- a/pkgs/desktops/plasma-5.4/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5.4/libkscreen/default.nix @@ -11,6 +11,8 @@ plasmaPackage { ]; buildInputs = [ libXrandr + ]; + propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/milou.nix b/pkgs/desktops/plasma-5.4/milou.nix index 767848ccc0e..c9a829731a9 100644 --- a/pkgs/desktops/plasma-5.4/milou.nix +++ b/pkgs/desktops/plasma-5.4/milou.nix @@ -9,7 +9,7 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - qtscript kcoreaddons ki18n kservice plasma-framework krunner + qtscript kcoreaddons kservice plasma-framework krunner ]; - propagatedBuildInputs = [ kdeclarative qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative ki18n qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5.4/oxygen.nix b/pkgs/desktops/plasma-5.4/oxygen.nix index 1dba49d93f4..882a5ea582b 100644 --- a/pkgs/desktops/plasma-5.4/oxygen.nix +++ b/pkgs/desktops/plasma-5.4/oxygen.nix @@ -9,10 +9,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - ki18n kcmutils kconfig kdecoration kguiaddons kwidgetsaddons + kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ]; + propagatedBuildInputs = [ frameworkintegration ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/oxygen-demo5" wrapKDEProgram "$out/bin/oxygen-settings5" diff --git a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix index e485262ab26..83f1d0c0d06 100644 --- a/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.4/plasma-desktop/default.nix @@ -17,7 +17,7 @@ plasmaPackage { ]; buildInputs = [ attica boost fontconfig kcmutils kdbusaddons kded - ki18n kitemmodels knewstuff knotifications + kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kwallet kwin libcanberra_kde libXcursor libpulseaudio libXft libxkbfile phonon plasma-framework plasma-workspace qtdeclarative qtx11extras qtsvg xf86inputevdev @@ -25,7 +25,7 @@ plasmaPackage { ]; propagatedBuildInputs = [ baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel + kglobalaccel ki18n ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix index 74b4bece7e2..e1f2dab7230 100644 --- a/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix +++ b/pkgs/desktops/plasma-5.4/plasma-mediacenter.nix @@ -10,8 +10,10 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons kguiaddons ki18n kio kservice plasma-framework + kconfig kcoreaddons kguiaddons kio kservice plasma-framework qtdeclarative qtmultimedia taglib ]; - propagatedBuildInputs = [ baloo kactivities kdeclarative kfilemetadata ]; + propagatedBuildInputs = [ + baloo kactivities kdeclarative kfilemetadata ki18n + ]; } diff --git a/pkgs/desktops/plasma-5.4/plasma-nm.nix b/pkgs/desktops/plasma-5.4/plasma-nm.nix index e244f586a81..b0904e957e6 100644 --- a/pkgs/desktops/plasma-5.4/plasma-nm.nix +++ b/pkgs/desktops/plasma-5.4/plasma-nm.nix @@ -14,13 +14,13 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kdbusaddons ki18n - kiconthemes kinit kio kitemviews knotifications kservice kwallet + kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kinit kio kitemviews knotifications kservice kwallet kwidgetsaddons kwindowsystem kxmlgui mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect plasma-framework solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kde5-nm-connection-editor" ''; diff --git a/pkgs/desktops/plasma-5.4/plasma-pa.nix b/pkgs/desktops/plasma-5.4/plasma-pa.nix index 2525dde0bcb..a8334c2bdcd 100644 --- a/pkgs/desktops/plasma-5.4/plasma-pa.nix +++ b/pkgs/desktops/plasma-5.4/plasma-pa.nix @@ -9,8 +9,7 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - glib kconfigwidgets kcoreaddons ki18n libpulseaudio - plasma-framework + glib kconfigwidgets kcoreaddons libpulseaudio plasma-framework ]; - propagatedBuildInputs = [ kdeclarative kglobalaccel ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix index a38c68d62dc..c1c57657a6b 100644 --- a/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5.4/polkit-kde-agent.nix @@ -18,7 +18,6 @@ plasmaPackage { extra-cmake-modules ]; buildInputs = [ - ki18n kwindowsystem kdbusaddons kwidgetsaddons @@ -29,4 +28,5 @@ plasmaPackage { knotifications polkitQt ]; + propagatedBuildInputs = [ ki18n ]; } diff --git a/pkgs/desktops/plasma-5.4/powerdevil.nix b/pkgs/desktops/plasma-5.4/powerdevil.nix index 5ed8087d0ce..22803256b99 100644 --- a/pkgs/desktops/plasma-5.4/powerdevil.nix +++ b/pkgs/desktops/plasma-5.4/powerdevil.nix @@ -11,10 +11,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kconfig kdbusaddons ki18n kidletime kio knotifyconfig libkscreen + kconfig kdbusaddons kidletime kio knotifyconfig libkscreen plasma-workspace solid udev ]; propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel qtx11extras + kactivities kauth kdelibs4support kglobalaccel ki18n qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5.4/systemsettings.nix b/pkgs/desktops/plasma-5.4/systemsettings.nix index 36b9d322f19..1c3ddfa7b06 100644 --- a/pkgs/desktops/plasma-5.4/systemsettings.nix +++ b/pkgs/desktops/plasma-5.4/systemsettings.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools ]; buildInputs = [ - kitemviews kcmutils ki18n kio kservice kiconthemes kwindowsystem + kitemviews kcmutils kio kservice kiconthemes kwindowsystem kxmlgui kdbusaddons kconfig ]; - propagatedBuildInputs = [ khtml ]; + propagatedBuildInputs = [ khtml ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/systemsettings5" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix index 59133e40432..2cd7281125f 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/baloo.nix @@ -7,10 +7,10 @@ kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcrash kdbusaddons ki18n kidletime kio lmdb qtquick1 solid + kconfig kcrash kdbusaddons kidletime kio lmdb qtquick1 solid ]; propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata qtbase + kauth kcoreaddons kfilemetadata ki18n qtbase ]; postInstall = '' wrapKDEProgram "$out/bin/baloo_file" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix index ad30cc87ecf..2470d5378b4 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/frameworkintegration.nix @@ -1,33 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, ki18n -, kiconthemes -, kio -, knotifications -, kwidgetsaddons -, libXcursor -, qtx11extras +{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion +, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications +, kwidgetsaddons, libXcursor, qtx11extras }: kdeFramework { name = "frameworkintegration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kbookmarks - kcompletion - kconfig - ki18n - kio - knotifications - kwidgetsaddons + kbookmarks kcompletion kconfig kio knotifications kwidgetsaddons libXcursor - qtx11extras ]; - propagatedBuildInputs = [ kconfigwidgets kiconthemes ]; + propagatedBuildInputs = [ kconfigwidgets ki18n kiconthemes qtx11extras ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix index cc39129815f..45ed7da463c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kactivities.nix @@ -7,10 +7,10 @@ kdeFramework { name = "kactivities"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons ki18n kio kservice + boost kcmutils kconfig kcoreaddons kdbusaddons kio kservice kwindowsystem kxmlgui ]; - propagatedBuildInputs = [ kdeclarative kglobalaccel qtdeclarative ]; + propagatedBuildInputs = [ kdeclarative kglobalaccel ki18n qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kactivitymanagerd" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix index 9fb366ae403..a0eb805e62b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kcmutils/default.nix @@ -7,9 +7,9 @@ kdeFramework { name = "kcmutils"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons ki18n kiconthemes kitemviews kpackage kxmlgui + kcoreaddons kiconthemes kitemviews kpackage kxmlgui ]; - propagatedBuildInputs = [ kconfigwidgets kdeclarative kservice ]; + propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; patches = [ ./kcmutils-pluginselector-follow-symlinks.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix index aa6fe877081..580914934b6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kconfigwidgets/default.nix @@ -5,8 +5,8 @@ kdeFramework { name = "kconfigwidgets"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kguiaddons ki18n ]; - propagatedBuildInputs = [ kauth kconfig kcodecs kwidgetsaddons ]; + buildInputs = [ kguiaddons ]; + propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; patches = [ ./kconfigwidgets-helpclient-follow-symlinks.patch ]; postInstall = '' wrapKDEProgram "$out/bin/preparetips5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix index 10cd2d602a6..d74f76ae151 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdeclarative.nix @@ -1,26 +1,15 @@ -{ kdeFramework, lib -, extra-cmake-modules -, epoxy -, kconfig -, kglobalaccel -, kguiaddons -, ki18n -, kiconthemes -, kio -, kpackage -, kwidgetsaddons -, kwindowsystem -, pkgconfig -, qtdeclarative +{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig +, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage +, kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative }: kdeFramework { name = "kdeclarative"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - epoxy kguiaddons ki18n kiconthemes kio kwidgetsaddons kwindowsystem + epoxy kguiaddons kiconthemes kio kwidgetsaddons kwindowsystem ]; - propagatedBuildInputs = [ kconfig kglobalaccel kpackage qtdeclarative ]; + propagatedBuildInputs = [ kconfig kglobalaccel ki18n kpackage qtdeclarative ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagelauncherqml" ''; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix index 5deed2036b6..fedba82ccdf 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdelibs4support.nix @@ -13,13 +13,13 @@ kdeFramework { name = "kdelibs4support"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kcompletion kconfig ki18n kio kservice kwidgetsaddons + kcompletion kconfig kio kservice kwidgetsaddons kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM ]; propagatedBuildInputs = [ kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons kiconthemes - kitemmodels kinit knotifications kparts ktextwidgets + kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n + kiconthemes kitemmodels kinit knotifications kparts ktextwidgets kunitconversion kwindowsystem ]; cmakeFlags = [ diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix index 4503d8bcd10..364fbd6a720 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdesu.nix @@ -1,16 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kpty +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty , kservice }: kdeFramework { name = "kdesu"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ki18n kservice ]; - propagatedBuildInputs = [ kpty ]; + buildInputs = [ kcoreaddons kservice ]; + propagatedBuildInputs = [ ki18n kpty ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix index 52ae0162b86..1922eaf010c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdewebkit.nix @@ -1,21 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kio -, kjobwidgets -, kparts -, kservice -, kwallet -, qtwebkit +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit }: kdeFramework { name = "kdewebkit"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ qtwebkit ]; + buildInputs = [ kconfig kcoreaddons kio kjobwidgets kparts kservice kwallet ]; + propagatedBuildInputs = [ ki18n qtwebkit ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix index 0ec13d1a15c..0eeaf89c58b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kdoctools/default.nix @@ -1,17 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, docbook_xml_dtd_45 -, docbook5_xsl -, karchive -, ki18n -, perl -, perlPackages +{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45 +, docbook5_xsl, karchive, ki18n, perl, perlPackages }: kdeFramework { name = "kdoctools"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ki18n ]; + buildInputs = [ karchive ]; + propagatedBuildInputs = [ ki18n ]; propagatedNativeBuildInputs = [ perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix index 53c509417f2..92ca1f26b93 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kfilemetadata.nix @@ -1,21 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attr -, ebook_tools -, exiv2 -, ffmpeg -, karchive -, ki18n -, popplerQt -, qtbase -, taglib +{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 +, ffmpeg, karchive, ki18n, popplerQt, qtbase, taglib }: kdeFramework { name = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive ki18n popplerQt taglib ]; - propagatedBuildInputs = [ qtbase ]; + buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive popplerQt taglib ]; + propagatedBuildInputs = [ qtbase ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix index 862c17f104f..02b516afedc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kiconthemes.nix @@ -1,15 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfigwidgets -, ki18n -, kitemviews -, qtsvg +{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +, kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfigwidgets ki18n kitemviews qtsvg ]; + buildInputs = [ kconfigwidgets kitemviews qtsvg ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix index 47f1aec72de..8caf17acd1a 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kinit/default.nix @@ -1,13 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcrash -, kdoctools -, ki18n -, kio -, kservice -, kwindowsystem -, libcap +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash +, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap , libcap_progs }: @@ -16,7 +8,8 @@ kdeFramework { name = "kinit"; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash ki18n kio kservice kwindowsystem libcap ]; + buildInputs = [ kconfig kcrash kio kservice kwindowsystem libcap ]; + propagatedBuildInputs = [ ki18n ]; patches = [ ./0001-kinit-libpath.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix index 6605de03e38..b81be46b5d5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kio.nix @@ -1,27 +1,8 @@ -{ kdeFramework, lib -, extra-cmake-modules -, acl -, karchive -, kbookmarks -, kcompletion -, kconfig -, kconfigwidgets -, kcoreaddons -, kdbusaddons -, kdoctools -, ki18n -, kiconthemes -, kitemviews -, kjobwidgets -, knotifications -, kservice -, ktextwidgets -, kwallet -, kwidgetsaddons -, kwindowsystem -, kxmlgui -, qtscript -, qtx11extras +{ kdeFramework, lib, extra-cmake-modules, acl, karchive +, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews +, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet +, kwidgetsaddons, kwindowsystem, kxmlgui, qtscript, qtx11extras , solid }: @@ -29,12 +10,13 @@ kdeFramework { name = "kio"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons ki18n kiconthemes + acl karchive kconfig kcoreaddons kdbusaddons kiconthemes knotifications ktextwidgets kwallet kwidgetsaddons kwindowsystem - qtscript qtx11extras + qtscript ]; propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets kitemviews kjobwidgets kservice kxmlgui solid + kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets + kservice kxmlgui solid qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/kcookiejar5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix index bbc5169a1cc..6997e48d07b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kjsembed.nix @@ -1,8 +1,4 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kdoctools -, ki18n -, kjs +{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs , qtsvg }: diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix index d0b884f8f68..631c431124b 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knewstuff.nix @@ -1,28 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, attica -, karchive -, kcompletion -, kconfig -, kcoreaddons -, ki18n -, kiconthemes -, kio -, kitemviews -, kservice -, ktextwidgets -, kwidgetsaddons -, kxmlgui +{ kdeFramework, lib, extra-cmake-modules, attica, karchive +, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio +, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui }: kdeFramework { name = "knewstuff"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio + karchive kcompletion kconfig kcoreaddons kiconthemes kio kitemviews ktextwidgets kwidgetsaddons ]; - propagatedBuildInputs = [ attica kservice kxmlgui ]; + propagatedBuildInputs = [ attica ki18n kservice kxmlgui ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix index f6509a166d4..c4b3408a794 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/knotifyconfig.nix @@ -1,16 +1,12 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, ki18n -, kio -, phonon +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, ki18n, kio, phonon }: kdeFramework { name = "knotifyconfig"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig ki18n kio phonon ]; + buildInputs = [ kcompletion kconfig kio phonon ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix index f7c3689503b..7c3a1afee72 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpackage/default.nix @@ -10,8 +10,8 @@ kdeFramework { name = "kpackage"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ karchive kconfig ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; + buildInputs = [ karchive kconfig ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; patches = [ ./0001-allow-external-paths.patch ]; postInstall = '' wrapKDEProgram "$out/bin/kpackagetool5" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix index 96c1b984ab7..1c3e0b2cbc5 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kparts.nix @@ -1,26 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kiconthemes -, kio -, kjobwidgets -, knotifications -, kservice -, ktextwidgets -, kwidgetsaddons -, kxmlgui +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice +, ktextwidgets, kwidgetsaddons, kxmlgui }: kdeFramework { name = "kparts"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications + kconfig kcoreaddons kiconthemes kjobwidgets knotifications kservice kwidgetsaddons ]; - propagatedBuildInputs = [ kio ktextwidgets kxmlgui ]; + propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix index ffc028d97c3..4c3877e7efd 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpeople.nix @@ -1,19 +1,14 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -, kitemviews -, kservice -, kwidgetsaddons -, qtdeclarative +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n +, kitemviews, kservice, kwidgetsaddons, qtdeclarative }: kdeFramework { name = "kpeople"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative + kcoreaddons kitemviews kservice kwidgetsaddons ]; + propagatedBuildInputs = [ ki18n qtdeclarative ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix index 72ac842a00a..2e34e6f674c 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kpty.nix @@ -1,14 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcoreaddons -, ki18n -}: +{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }: kdeFramework { name = "kpty"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kcoreaddons ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kross.nix b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix index ca14e9827e2..7c6f079feaa 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kross.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kross.nix @@ -1,15 +1,6 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kcoreaddons -, kdoctools -, ki18n -, kiconthemes -, kio -, kparts -, kwidgetsaddons -, kxmlgui -, qtscript +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons +, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons +, kxmlgui, qtscript }: kdeFramework { diff --git a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix index 618494ef5c5..0891654eb88 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/krunner.nix @@ -1,13 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, ki18n -, kio -, kservice -, plasma-framework -, qtquick1 -, solid +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, ki18n, kio, kservice, plasma-framework, qtquick1, solid , threadweaver }: @@ -15,9 +7,9 @@ kdeFramework { name = "krunner"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kcoreaddons ki18n kio kservice qtquick1 solid threadweaver + kconfig kcoreaddons kio kservice qtquick1 solid threadweaver ]; - propagatedBuildInputs = [ plasma-framework ]; + propagatedBuildInputs = [ ki18n plasma-framework ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix index b46797f5e0e..b1c47ec53d6 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kservice/default.nix @@ -1,20 +1,13 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kdoctools -, ki18n -, kwindowsystem +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: kdeFramework { name = "kservice"; setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; - propagatedBuildInputs = [ kconfig ]; + buildInputs = [ kcoreaddons kcrash kdbusaddons kwindowsystem ]; + propagatedBuildInputs = [ kconfig ki18n ]; patches = [ ./kservice-kbuildsycoca-follow-symlinks.patch ./kservice-kbuildsycoca-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix index 8c02e602c5d..e4b6cfd1e44 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktexteditor/default.nix @@ -1,25 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, karchive -, kconfig -, kguiaddons -, ki18n -, kio -, kiconthemes -, kparts -, perl -, qtscript -, qtxmlpatterns -, sonnet +{ kdeFramework, lib, extra-cmake-modules, karchive, kconfig +, kguiaddons, ki18n, kio, kiconthemes, kparts, perl, qtscript +, qtxmlpatterns, sonnet }: kdeFramework { name = "ktexteditor"; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ - karchive kconfig kguiaddons ki18n kiconthemes kio kparts - qtscript qtxmlpatterns sonnet + karchive kconfig kguiaddons kiconthemes kio kparts qtscript + qtxmlpatterns sonnet ]; + propagatedBuildInputs = [ ki18n ]; patches = [ ./0001-no-qcoreapplication.patch ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix index e27839162ef..5ef2353a361 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/ktextwidgets.nix @@ -1,12 +1,5 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcompletion -, kconfig -, kconfigwidgets -, ki18n -, kiconthemes -, kservice -, kwindowsystem +{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig +, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem , sonnet }: diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix index 6c6a4caeb98..3cf0f847d83 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kunitconversion.nix @@ -1,12 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -}: +{ kdeFramework, lib, extra-cmake-modules, ki18n }: kdeFramework { name = "kunitconversion"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; + propagatedBuildInputs = [ ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix index 267ddf8303d..e028a94b017 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kwallet.nix @@ -1,25 +1,16 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kconfig -, kcoreaddons -, kdbusaddons -, kdoctools -, ki18n -, kiconthemes -, knotifications -, kservice -, kwidgetsaddons -, kwindowsystem -, libgcrypt +{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons +, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications +, kservice, kwidgetsaddons, kwindowsystem, libgcrypt }: kdeFramework { name = "kwallet"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kcoreaddons kdbusaddons ki18n kiconthemes knotifications + kconfig kcoreaddons kdbusaddons kiconthemes knotifications kservice kwidgetsaddons kwindowsystem libgcrypt ]; + propagatedBuildInputs = [ ki18n ]; postInstall = '' wrapKDEProgram "$out/bin/kwalletd5" wrapKDEProgram "$out/bin/kwallet-query" diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix index 3eeea735d82..69a59f0c417 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlgui.nix @@ -7,10 +7,10 @@ kdeFramework { name = "kxmlgui"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attica kconfig kconfigwidgets ki18n kiconthemes kitemviews + attica kconfig kconfigwidgets kiconthemes kitemviews ktextwidgets kwindowsystem sonnet ]; - propagatedBuildInputs = [ kglobalaccel ]; + propagatedBuildInputs = [ kglobalaccel ki18n ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix index b28c00a33be..20a300b68bc 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/kxmlrpcclient.nix @@ -1,14 +1,9 @@ -{ kdeFramework, lib -, extra-cmake-modules -, ki18n -, kio -}: +{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }: kdeFramework { name = "kxmlrpcclient"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ ki18n ]; - propagatedBuildInputs = [ kio ]; + propagatedBuildInputs = [ ki18n kio ]; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix index 33eff0f424c..e8e873d0cb9 100644 --- a/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix +++ b/pkgs/development/libraries/kde-frameworks-5.14/plasma-framework/default.nix @@ -10,11 +10,11 @@ kdeFramework { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - ki18n kiconthemes kio knotifications kwindowsystem kxmlgui - qtscript qtx11extras + kiconthemes kio knotifications kwindowsystem kxmlgui qtscript ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel kpackage kservice + kactivities kdeclarative kglobalaccel ki18n kpackage kservice + qtx11extras ]; postInstall = '' wrapKDEProgram "$out/bin/plasmapkg2"