From 36f005b830ebd8a421c2a3201f1c79a864606437 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 27 Jun 2019 02:32:50 -0400 Subject: [PATCH] geeqie: fix build with exiv2 0.27.1 --- pkgs/applications/graphics/geeqie/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4e1e7138e775..e4e31db94a6b 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext, intltool , gtk3, lcms2, exiv2, libchamplain, clutter-gtk, ffmpegthumbnailer, fbida -, wrapGAppsHook +, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -12,8 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; }; - # Do not build the changelog as this requires markdown. - patches = [ ./geeqie-no-changelog.patch ]; + patches = [ + # Do not build the changelog as this requires markdown. + ./geeqie-no-changelog.patch + # Fixes build with exiv2 0.27.1 + (fetchpatch { + name = "geeqie-exiv2-0.27.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d"; + sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p"; + }) + ]; preConfigure = "./autogen.sh";