From 9f30edc08530f754a3b16da08b3d7e62e72d4516 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 5 Nov 2017 17:52:09 +0100
Subject: [PATCH 1/2] gnome3.glade: fix compatibility with glib 2.53.4

Closes: #31272
---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index da49c36cd069..6064a8c768aa 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, intltool, fetchurl, python
+{ stdenv, intltool, fetchurl, python, autoreconfHook
 , pkgconfig, gtk3, glib
 , makeWrapper, itstool, libxml2, docbook_xsl
 , gnome3, librsvg, gdk_pixbuf, libxslt }:
@@ -8,13 +8,25 @@ stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    pkgconfig
+    # reconfiguration
+    autoreconfHook gnome3.gnome_common gnome3.yelp_tools
+  ];
   buildInputs = [ gtk3 glib intltool itstool libxml2 python
                   gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
                   gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
 
   enableParallelBuilding = true;
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=782161
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=351054;
+      sha256 = "093wjjj40027pkqqnm14jb2dp2i2m8p1bayqx1lw18pq66c8fahn";
+    })
+  ];
+
   preFixup = ''
     wrapProgram "$out/bin/glade" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

From 6ad65e046fa19e8249e2b8e3c598656c949f1e03 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 5 Nov 2017 17:58:30 +0100
Subject: [PATCH 2/2] gnome3.glade: clean up

---
 pkgs/desktops/gnome-3/apps/glade/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index 6064a8c768aa..ce29ebf0a7ea 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -9,13 +9,13 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   nativeBuildInputs = [
-    pkgconfig
+    pkgconfig intltool itstool makeWrapper docbook_xsl libxslt
     # reconfiguration
     autoreconfHook gnome3.gnome_common gnome3.yelp_tools
   ];
-  buildInputs = [ gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
+  buildInputs = [ gtk3 glib libxml2 python
+                  gnome3.gsettings_desktop_schemas
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   enableParallelBuilding = true;