From df92bdf3fb55ed6de71e3e6be41d4569b3e0dd5e Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 18 Mar 2023 01:39:35 +0300 Subject: kde/gear: add new dependencies --- pkgs/applications/kde/colord-kde.nix | 8 ++++---- pkgs/applications/kde/dolphin.nix | 4 ++-- pkgs/applications/kde/gwenview.nix | 4 +++- pkgs/applications/kde/kaccounts-integration.nix | 3 ++- pkgs/applications/kde/kate.nix | 6 ++---- pkgs/applications/kde/kdebugsettings.nix | 4 ++-- pkgs/applications/kde/kdeconnect-kde.nix | 4 ++++ pkgs/applications/kde/kdenetwork-filesharing.nix | 4 ++-- pkgs/applications/kde/kimap.nix | 4 ++-- pkgs/applications/kde/kitinerary.nix | 8 ++------ pkgs/applications/kde/kleopatra.nix | 4 ++-- pkgs/applications/kde/konsole.nix | 4 ++-- pkgs/applications/kde/kontactinterface.nix | 5 +++-- pkgs/applications/kde/kpublictransport.nix | 9 +++++++++ pkgs/applications/kde/krfb.nix | 4 ++-- pkgs/applications/kde/libkcddb.nix | 4 ++-- pkgs/applications/kde/okular.nix | 4 ++-- pkgs/applications/kde/pimcommon.nix | 4 ++-- pkgs/applications/kde/spectacle.nix | 4 +++- 19 files changed, 52 insertions(+), 39 deletions(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/kde/colord-kde.nix b/pkgs/applications/kde/colord-kde.nix index e250df5633f70..07f34c84d6f16 100644 --- a/pkgs/applications/kde/colord-kde.nix +++ b/pkgs/applications/kde/colord-kde.nix @@ -1,11 +1,11 @@ -{ mkDerivation, lib, fetchurl +{ mkDerivation, lib , extra-cmake-modules, ki18n , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem -, kitemviews, lcms2, libXrandr, qtx11extras +, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras }: -mkDerivation rec { +mkDerivation { pname = "colord-kde"; nativeBuildInputs = [ extra-cmake-modules ]; @@ -13,7 +13,7 @@ mkDerivation rec { buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons - kwindowsystem kitemviews lcms2 libXrandr qtx11extras + kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras ]; meta = with lib; { diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index b15c6fea4a0ec..d5340eaf379e9 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -5,8 +5,7 @@ kcompletion, kconfig, kcoreaddons, kdbusaddons, kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications, kparts, ktexteditor, kwindowsystem, phonon, solid, - kuserfeedback, - wayland, qtwayland + kuserfeedback, wayland, qtwayland, qtx11extras }: mkDerivation { @@ -26,6 +25,7 @@ mkDerivation { phonon solid kuserfeedback wayland qtwayland + qtx11extras ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 545b1a2b69e78..c4dc46f38afba 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -3,7 +3,8 @@ extra-cmake-modules, kdoctools, exiv2, lcms2, cfitsio, baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator + phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator, + wayland, wayland-protocols }: mkDerivation { @@ -19,6 +20,7 @@ mkDerivation { baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon exiv2 lcms2 cfitsio qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator + wayland wayland-protocols ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix index ef69f564f128b..069bedcb53b25 100644 --- a/pkgs/applications/kde/kaccounts-integration.nix +++ b/pkgs/applications/kde/kaccounts-integration.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }: +{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond, qcoro }: mkDerivation { pname = "kaccounts-integration"; @@ -19,5 +19,6 @@ mkDerivation { kwallet accounts-qt signond + qcoro ]; } diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index de76a476df066..646fedba158f0 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -4,8 +4,7 @@ kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n, kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole, kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2, - kuserfeedback, - plasma-framework, qtscript, threadweaver + kuserfeedback, plasma-framework, qtscript, threadweaver, qtx11extras }: mkDerivation { @@ -33,8 +32,7 @@ mkDerivation { kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver - knewstuff - kuserfeedback + knewstuff kuserfeedback qtx11extras ]; propagatedUserEnvPkgs = [ konsole ]; } diff --git a/pkgs/applications/kde/kdebugsettings.nix b/pkgs/applications/kde/kdebugsettings.nix index 2ebf9c8894486..829f7a26eb304 100644 --- a/pkgs/applications/kde/kdebugsettings.nix +++ b/pkgs/applications/kde/kdebugsettings.nix @@ -2,7 +2,7 @@ mkDerivation, lib, extra-cmake-modules, kdoctools, gettext, - kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, + kcoreaddons, kconfig, kdbusaddons, kwidgetsaddons, kitemviews, kcompletion, kxmlgui, python3 }: @@ -16,7 +16,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion python3 + gettext kcoreaddons kconfig kdbusaddons kwidgetsaddons kitemviews kcompletion kxmlgui python3 ]; propagatedUserEnvPkgs = [ ]; } diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index 157ca73ecfc13..f67a338b3495d 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -16,6 +16,7 @@ , libXtst , libfakekey , makeWrapper +, modemmanager-qt , pulseaudio-qt , qca-qt5 , qqc2-desktop-style @@ -26,6 +27,7 @@ , breeze-icons , sshfs , wayland +, wayland-protocols , wayland-scanner , plasma-wayland-protocols }: @@ -47,6 +49,7 @@ mkDerivation { kwayland libXtst libfakekey + modemmanager-qt pulseaudio-qt qca-qt5 qqc2-desktop-style @@ -55,6 +58,7 @@ mkDerivation { qtquickcontrols2 qtx11extras wayland + wayland-protocols wayland-scanner plasma-wayland-protocols # otherwise buttons are blank on non-kde diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix index 74ed9386cf052..4cff4a84fc407 100644 --- a/pkgs/applications/kde/kdenetwork-filesharing.nix +++ b/pkgs/applications/kde/kdenetwork-filesharing.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, + kcoreaddons, kdeclarative, ki18n, kio, kwidgetsaddons, samba, qcoro }: mkDerivation { @@ -11,5 +11,5 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba ]; + buildInputs = [ kcoreaddons kdeclarative ki18n kio kwidgetsaddons samba qcoro ]; } diff --git a/pkgs/applications/kde/kimap.nix b/pkgs/applications/kde/kimap.nix index ece32e3ee0571..8abaa1714294c 100644 --- a/pkgs/applications/kde/kimap.nix +++ b/pkgs/applications/kde/kimap.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - cyrus_sasl, kcoreaddons, ki18n, kio, kmime + cyrus_sasl, kcoreaddons, ki18n, kio, kmime, kitemmodels }: mkDerivation { @@ -12,6 +12,6 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ ki18n kio ]; - propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime ]; + propagatedBuildInputs = [ cyrus_sasl kcoreaddons kmime kitemmodels ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index f69e705bb2f92..d795e4fac4c89 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules , qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore -, shared-mime-info +, shared-mime-info, zxing-cpp }: mkDerivation { @@ -16,11 +16,7 @@ mkDerivation { ]; buildInputs = [ qtdeclarative kmime kpkpass poppler - kcontacts kcalendarcore - ]; - - CXXFLAGS = [ - "-I${lib.getDev ki18n}/include/KF5" # Fixes: ki18n_version.h: No such file or directory + kcontacts kcalendarcore ki18n zxing-cpp ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index a02e7b08aa651..fc844796acd02 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, - knotifications, kwindowsystem, kxmlgui, libkleo, kcrash + knotifications, kwindowsystem, kxmlgui, libkleo, kcrash, kpipewire }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { buildInputs = [ boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime - knotifications kwindowsystem kxmlgui libkleo kcrash + knotifications kwindowsystem kxmlgui libkleo kcrash kpipewire ]; meta = { diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 220cd6a16d573..9771e269faafd 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -4,7 +4,7 @@ kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kio, knotifications, knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons, - kwindowsystem, kxmlgui, qtscript, knewstuff + kwindowsystem, kxmlgui, qtscript, knewstuff, qtmultimedia }: mkDerivation { @@ -19,7 +19,7 @@ mkDerivation { buildInputs = [ kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty - kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff + kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff qtmultimedia ]; passthru.tests.test = nixosTests.terminal-emulators.konsole; diff --git a/pkgs/applications/kde/kontactinterface.nix b/pkgs/applications/kde/kontactinterface.nix index b680a088a6ea9..292a21e32c2c8 100644 --- a/pkgs/applications/kde/kontactinterface.nix +++ b/pkgs/applications/kde/kontactinterface.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - kiconthemes, kparts, kwindowsystem, kxmlgui + kiconthemes, kparts, kwindowsystem, kxmlgui, + qtx11extras }: mkDerivation { @@ -12,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kiconthemes kwindowsystem kxmlgui + kiconthemes kwindowsystem kxmlgui qtx11extras ]; propagatedBuildInputs = [ kparts ]; } diff --git a/pkgs/applications/kde/kpublictransport.nix b/pkgs/applications/kde/kpublictransport.nix index fbfd3fcc8a465..0678aa10daff5 100644 --- a/pkgs/applications/kde/kpublictransport.nix +++ b/pkgs/applications/kde/kpublictransport.nix @@ -1,6 +1,9 @@ { mkDerivation , lib , extra-cmake-modules +, qtquickcontrols2 +, networkmanager-qt +, ki18n }: mkDerivation { @@ -10,4 +13,10 @@ mkDerivation { maintainers = [ maintainers.samueldr ]; }; nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + qtquickcontrols2 + networkmanager-qt + ki18n + ]; } diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix index 65213fa15afb6..367e9ab010812 100644 --- a/pkgs/applications/kde/krfb.nix +++ b/pkgs/applications/kde/krfb.nix @@ -1,7 +1,7 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools , kconfig, kcoreaddons, kcrash, kdbusaddons, kdnssd, knotifications, kwallet -, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland +, kwidgetsaddons, kwindowsystem, kxmlgui, kwayland, kpipewire , libvncserver, libXtst, libXdamage , qtx11extras, pipewire, plasma-wayland-protocols, wayland }: @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ libvncserver libXtst libXdamage kconfig kcoreaddons kcrash kdbusaddons knotifications kwallet kwidgetsaddons - kwindowsystem kxmlgui kwayland + kwindowsystem kxmlgui kwayland kpipewire qtx11extras pipewire plasma-wayland-protocols diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix index 3dde496050253..d7523de0db8a5 100644 --- a/pkgs/applications/kde/libkcddb.nix +++ b/pkgs/applications/kde/libkcddb.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools -, kcodecs, ki18n, kio, kwidgetsaddons +, kcodecs, ki18n, kio, kwidgetsaddons, kcmutils , libmusicbrainz5 }: mkDerivation { @@ -9,7 +9,7 @@ mkDerivation { maintainers = with maintainers; [ peterhoeg ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtbase ]; + buildInputs = [ qtbase kcmutils ]; propagatedBuildInputs = [ kcodecs ki18n kio kwidgetsaddons libmusicbrainz5 diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index e2d468b4ff7b2..727fc673b1745 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -5,7 +5,7 @@ , kdbusaddons, kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts , kpty, kpurpose, kwallet, kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler , qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash -, withSpeech ? true, qtspeech +, withSpeech ? true, qtspeech, qtx11extras }: mkDerivation { @@ -18,7 +18,7 @@ mkDerivation { kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kpurpose kwallet kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 - qtdeclarative qtsvg threadweaver kcrash chmlib + qtdeclarative qtsvg threadweaver kcrash chmlib qtx11extras ] ++ lib.optional withSpeech qtspeech; # InitialPreference values are too high and end up making okular diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index 896c202529a67..d82bc3f506b50 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -4,7 +4,7 @@ akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit, - kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine + kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine, ktextaddons }: mkDerivation { @@ -17,7 +17,7 @@ mkDerivation { buildInputs = [ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap - kpurpose kwallet kwindowsystem libkdepim qtwebengine + kpurpose kwallet kwindowsystem libkdepim qtwebengine ktextaddons ]; propagatedBuildInputs = [ akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index cbba15beebc72..db819ba41f97b 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,6 +4,7 @@ , kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator +, qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire }: mkDerivation { @@ -12,7 +13,8 @@ mkDerivation { buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor - knewstuff kwayland kcolorpicker kimageannotator + knewstuff kwayland kcolorpicker kimageannotator qcoro qtquickcontrols2 + wayland plasma-wayland-protocols kpurpose kpipewire ]; postPatch = '' substituteInPlace desktop/org.kde.spectacle.desktop.cmake \ -- cgit 1.4.1