diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/kde')
-rw-r--r-- | nixpkgs/pkgs/applications/kde/kitinerary.nix | 11 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/kde/konsole.nix | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/kde/kitinerary.nix b/nixpkgs/pkgs/applications/kde/kitinerary.nix index f69e705bb2f9..83763ba965af 100644 --- a/nixpkgs/pkgs/applications/kde/kitinerary.nix +++ b/nixpkgs/pkgs/applications/kde/kitinerary.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, extra-cmake-modules +{ mkDerivation, fetchpatch, lib, extra-cmake-modules , qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore , shared-mime-info @@ -10,6 +10,15 @@ mkDerivation { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; }; + + patches = [ + # Fix build with poppler 22.03 + (fetchpatch { + url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch"; + sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04="; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info # for update-mime-database diff --git a/nixpkgs/pkgs/applications/kde/konsole.nix b/nixpkgs/pkgs/applications/kde/konsole.nix index 098001ef4c23..23cbdf28477d 100644 --- a/nixpkgs/pkgs/applications/kde/konsole.nix +++ b/nixpkgs/pkgs/applications/kde/konsole.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, nixosTests, extra-cmake-modules, kdoctools, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons, ki18n, kiconthemes, kinit, kio, knotifications, @@ -22,5 +22,7 @@ mkDerivation { kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff ]; + passthru.tests.test = nixosTests.terminal-emulators.konsole; + propagatedUserEnvPkgs = [ (lib.getBin kinit) ]; } |