From 4a99872c976bfff4fc422b79bd4411bf64d36fd5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 17 Nov 2020 18:13:36 +0100
Subject: [PATCH] libhandy_0: disable glade catalog

It does not work with recent glade.
---
 pkgs/development/libraries/libhandy/0.x.nix | 23 +++++----------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix
index 2923f2da25d0..9cf4f615dd28 100644
--- a/pkgs/development/libraries/libhandy/0.x.nix
+++ b/pkgs/development/libraries/libhandy/0.x.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala
+{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala
 , gtk-doc, docbook_xsl, docbook_xml_dtd_43
-, gtk3, gnome3, glade
+, gtk3, gnome3
 , dbus, xvfb_run, libxml2
 , hicolor-icon-theme
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "libhandy";
   version = "0.0.13";
 
-  outputs = [ "out" "dev" "devdoc" "glade" ];
+  outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev";
 
   src = fetchFromGitLab {
@@ -20,32 +20,19 @@ stdenv.mkDerivation rec {
     sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5";
   };
 
-  patches = [
-    # Fix build with Glade 3.36.0
-    # https://source.puri.sm/Librem5/libhandy/merge_requests/451
-    (fetchpatch {
-      url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch";
-      sha256 = "0qgh4i0l1028qxqmig4x2c10yj5s80skl70qnc5wnp71s45alvk5";
-      excludes = [ "glade/glade-hdy-header-bar.c" ];
-    })
-  ];
-
   nativeBuildInputs = [
     meson ninja pkgconfig gobject-introspection vala libxml2
     gtk-doc docbook_xsl docbook_xml_dtd_43
   ];
-  buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ];
+  buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ];
   checkInputs = [ dbus xvfb_run hicolor-icon-theme ];
 
   mesonFlags = [
     "-Dgtk_doc=true"
-    "-Dglade_catalog=enabled"
+    "-Dglade_catalog=disabled"
     "-Dintrospection=enabled"
   ];
 
-  PKG_CONFIG_GLADEUI_2_0_MODULEDIR = "${placeholder "glade"}/lib/glade/modules";
-  PKG_CONFIG_GLADEUI_2_0_CATALOGDIR = "${placeholder "glade"}/share/glade/catalogs";
-
   doCheck = true;
 
   checkPhase = ''