diff options
-rw-r--r-- | pkgs/applications/kde/filelight.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/kde/gwenview.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/kde/kdeconnect-kde.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/kde/messagelib.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/kde/okular.nix | 4 |
5 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix index 64592ab99443..f861c04a7287 100644 --- a/pkgs/applications/kde/filelight.nix +++ b/pkgs/applications/kde/filelight.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - kio, kparts, kxmlgui, qtbase, qtscript, solid + kio, kparts, kxmlgui, qtbase, qtscript, solid, qtquickcontrols2, kdeclarative }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ - kio kparts kxmlgui qtscript solid + kio kparts kxmlgui qtscript solid qtquickcontrols2 kdeclarative ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix index 27d676303f9b..36d46f43966d 100644 --- a/pkgs/applications/kde/gwenview.nix +++ b/pkgs/applications/kde/gwenview.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - exiv2, lcms2, + exiv2, lcms2, cfitsio, baloo, kactivities, kio, kipi-plugins, kitemmodels, kparts, libkdcraw, libkipi, - phonon, qtimageformats, qtsvg, qtx11extras, kinit + phonon, qtimageformats, qtsvg, qtx11extras, kinit, kpurpose, kcolorpicker, kimageannotator }: mkDerivation { @@ -17,8 +17,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ baloo kactivities kio kitemmodels kparts libkdcraw libkipi phonon - exiv2 lcms2 - qtimageformats qtsvg qtx11extras + exiv2 lcms2 cfitsio + qtimageformats qtsvg qtx11extras kpurpose kcolorpicker kimageannotator ]; propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ]; } diff --git a/pkgs/applications/kde/kdeconnect-kde.nix b/pkgs/applications/kde/kdeconnect-kde.nix index e21a85df0143..60aad7d2a955 100644 --- a/pkgs/applications/kde/kdeconnect-kde.nix +++ b/pkgs/applications/kde/kdeconnect-kde.nix @@ -28,6 +28,7 @@ , sshfs , wayland , wayland-scanner +, plasma-wayland-protocols }: mkDerivation { @@ -56,6 +57,7 @@ mkDerivation { qtx11extras wayland wayland-scanner + plasma-wayland-protocols # otherwise buttons are blank on non-kde breeze-icons ]; diff --git a/pkgs/applications/kde/messagelib.nix b/pkgs/applications/kde/messagelib.nix index 193b9cadf53c..6709a1f072a5 100644 --- a/pkgs/applications/kde/messagelib.nix +++ b/pkgs/applications/kde/messagelib.nix @@ -5,7 +5,7 @@ grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts, kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap, kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo, - pimcommon, qca-qt5, qtwebengine, syntax-highlighting, fetchpatch + pimcommon, qca-qt5, qtwebengine, syntax-highlighting }: mkDerivation { @@ -14,17 +14,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = [ - # fix compatibility with cmake 3.24 - (fetchpatch { - url = "https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3.patch"; - hash = "sha256-H0ayU81HxX5moHOQ3hDW7tg824oqK1p9atrBhuvZ8K8="; - }) - (fetchpatch { - url = "https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c2.patch"; - hash = "sha256-tBFWCfttjDjyQyWnKdhVfLY6QsixzqqYuvD77GVH080="; - }) - ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 9962500d907f..87aeff1f912a 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -5,7 +5,7 @@ karchive, kbookmarks, 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 + qca-qt5, qtdeclarative, qtsvg, threadweaver, kcrash, qtspeech }: mkDerivation { @@ -16,7 +16,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 + qtdeclarative qtsvg threadweaver kcrash qtspeech ] ++ lib.optional (!stdenv.isAarch64) chmlib; # InitialPreference values are too high and end up making okular |