From 249aa8d8dc0fc893b023442af0951576d185ac3f Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Tue, 5 Apr 2022 14:46:47 +0200 Subject: Revert "plasma5Packages.kitinerary: fix build with Poppler 22.03" This reverts commit 9adc2089f943115bc7634ba7e381e9c4ed072188. Clash with update; the patch is already contained and won't apply. --- pkgs/applications/kde/kitinerary.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index 83763ba965afc..f69e705bb2f92 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchpatch, lib, extra-cmake-modules +{ mkDerivation, lib, extra-cmake-modules , qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore , shared-mime-info @@ -10,15 +10,6 @@ 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 -- cgit 1.4.1