summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/kde
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-12-11 08:30:09 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-12-11 08:31:04 +0100
commitcd8b36411a930e3824f7b7746f317b42d364ad3a (patch)
tree9a6f844fbfcd4e38ee064b91e5811fdb2547b67e /pkgs/applications/kde
parentf6be2d2635f8d6199ebd69f666f377a7ef43df8f (diff)
kompare: fix build with patch
Obsolete methods were still in use when 20.08 was released. This patch ports away from them.
Diffstat (limited to 'pkgs/applications/kde')
-rw-r--r--pkgs/applications/kde/kompare.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index bbaad3a02f83..3a264e402574 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,7 +1,8 @@
{
mkDerivation, lib,
extra-cmake-modules, kdoctools,
- kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2
+ kiconthemes, kparts, ktexteditor, kwidgetsaddons, libkomparediff2,
+ fetchpatch
}:
mkDerivation {
@@ -11,5 +12,15 @@ mkDerivation {
buildInputs = [
kiconthemes kparts ktexteditor kwidgetsaddons libkomparediff2
];
+
+ patches = [
+ (fetchpatch {
+ # Portaway from Obsolete methods of QPrinter
+ # Part of v20.12.0
+ url = "https://invent.kde.org/sdk/kompare/-/commit/68d3eee36c48a2f44ccfd3f9e5a36311b829104b.patch";
+ sha256 = "B2i5n5cUDjCqTEF0OyTb1+LhPa5yWCnFycwijf35kwU=";
+ })
+ ];
+
outputs = [ "out" "dev" ];
}