diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-11 08:30:09 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-12-11 08:31:04 +0100 |
| commit | cd8b36411a930e3824f7b7746f317b42d364ad3a (patch) | |
| tree | 9a6f844fbfcd4e38ee064b91e5811fdb2547b67e /pkgs/applications/kde/kompare.nix | |
| parent | f6be2d2635f8d6199ebd69f666f377a7ef43df8f (diff) | |
| download | nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.tar nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.tar.gz nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.tar.bz2 nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.tar.lz nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.tar.xz nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.tar.zst nixpkgs-cd8b36411a930e3824f7b7746f317b42d364ad3a.zip | |
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/kompare.nix')
| -rw-r--r-- | pkgs/applications/kde/kompare.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix index bbaad3a02f8..3a264e40257 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" ]; } |