From 1a494794845c494be8be893d81ca4dcd559c180e Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Thu, 4 Jul 2019 08:02:10 -0400
Subject: [PATCH] gnome3.gnome-contacts: fix build

ibhandy 0.0.10 added a HeaderBar type, which means this
clashes with that of Gtk. Apply upstream patch that fixes this.

Instigated by
* 48044cda54265ec69d3988bf4d06199b920c212b
---
 .../gnome-3/core/gnome-contacts/default.nix        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index a405ca0f808..57cb90c7c45 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, gettext, fetchurl, evolution-data-server
+{ stdenv, gettext, fetchurl, evolution-data-server, fetchpatch
 , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
 , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
 , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
@@ -31,6 +31,18 @@ in stdenv.mkDerivation rec {
     "-Dtelepathy=true"
   ];
 
+  patches = [
+    # Fixes build with libhandy >= 0.0.10
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/c5eee38cd2556403a640a0a4c11d36cbf9a5a798.patch";
+      sha256 = "0s2cl7z6b0x3ky4y28yyxc9x5zp4r3vqmvbhz5m2fm6830fyjg13";
+    })
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-contacts/commit/1f1500ca01098ffda6392f5ec9ce3a29a48a84b1.patch";
+      sha256 = "082zaaj2l5cgr2qy145x8yknja87r0vpigrhidal40041kd5nldg";
+    })
+  ];
+
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
     patchShebangs build-aux/meson_post_install.py