summary refs log tree commit diff
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-06-26 21:34:14 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-06-27 03:18:05 -0400
commitea2fb569d1fc3abda9dfe46e9f61b11c0897ef96 (patch)
tree1e0aa48f8b35592435e34bc53e75a86f504e6b36
parent91a3b41967e1ef368d123303342d3c42d857a38f (diff)
downloadnixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.tar
nixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.tar.gz
nixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.tar.bz2
nixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.tar.lz
nixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.tar.xz
nixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.tar.zst
nixpkgs-ea2fb569d1fc3abda9dfe46e9f61b11c0897ef96.zip
gwenview: fix build with exiv2 0.27.1
-rw-r--r--pkgs/applications/kde/gwenview.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 3d03d1dea3e..ceb928acdf2 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   exiv2, lcms2,
   baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
-  phonon, qtimageformats, qtsvg, qtx11extras, kinit
+  phonon, qtimageformats, qtsvg, qtx11extras, kinit, fetchpatch
 }:
 
 mkDerivation {
@@ -18,4 +18,12 @@ mkDerivation {
     qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins libkipi (lib.getBin kinit) ];
+
+  # Fixes build with exiv2-0.27.1. Drop in 19.04.2
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/KDE/gwenview/commit/172560b845460b6121154f88221c855542219943.patch";
+      sha256 = "0y1l34h2s7rhfknvg6ggcc389jfzhpq69wf0s3xd5ccwfw7c0ycq";
+    })
+  ];
 }