diff --git a/pkgs/applications/kde/kaddressbook.nix b/pkgs/applications/kde/kaddressbook.nix index 7a2a319c655a..4ab0721de1af 100644 --- a/pkgs/applications/kde/kaddressbook.nix +++ b/pkgs/applications/kde/kaddressbook.nix @@ -21,4 +21,7 @@ mkDerivation { kdbusaddons ki18n kontactinterface kparts kpimtextedit kxmlgui libkdepim libkleo mailcommon pimcommon prison qgpgme qtbase ]; + postInstall = '' + mkdir -p "$out/include/KF5" + ''; } diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 42532644a1a6..2baf991f2fb6 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -5,7 +5,7 @@ incidenceeditor, kcalendarcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, - kitinerary, kontactinterface + kitinerary, kontactinterface, kaddressbook, discount }: mkDerivation { @@ -20,6 +20,6 @@ mkDerivation { incidenceeditor kcalendarcore kcalutils kconfig kdbusaddons kdeclarative kholidays ki18n kmime ktexteditor ktnef libgravatar libksieve mailcommon mailimporter messagelib poppler prison kpkpass - kitinerary kontactinterface + kitinerary kontactinterface kaddressbook discount ]; } diff --git a/pkgs/applications/kde/picmi.nix b/pkgs/applications/kde/picmi.nix index 205f1bd5d12f..30ee9fa84369 100644 --- a/pkgs/applications/kde/picmi.nix +++ b/pkgs/applications/kde/picmi.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchpatch +{ mkDerivation, lib , libkdegames, extra-cmake-modules , kdeclarative, knewstuff }: @@ -16,16 +16,6 @@ mkDerivation { platforms = platforms.linux; }; - patches = [ - # fix compile error due to usage of deprecated things - # probably can be removed with the next kde bump - (fetchpatch { - url = "https://invent.kde.org/games/picmi/-/commit/99639fb499fe35eb463621efca1c0e4ff2a52bad.patch"; - revert = true; - sha256 = "sha256-rRhTvUB1Hpc3bLv9b5yIf/G7uJy2/OgBfXToZwV4jrg="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index dff5e883cb5e..40153af70e83 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -16,11 +16,11 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets - kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ - akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap + akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap kpimtextedit ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/skanpage.nix b/pkgs/applications/kde/skanpage.nix index 024ad25ee6df..d06ff7746bb9 100644 --- a/pkgs/applications/kde/skanpage.nix +++ b/pkgs/applications/kde/skanpage.nix @@ -6,6 +6,7 @@ , ktextwidgets , libksane , qtquickcontrols2 +, kpurpose }: mkDerivation rec { @@ -18,6 +19,7 @@ mkDerivation rec { ktextwidgets libksane qtquickcontrols2 + kpurpose ]; meta = with lib; {