From 13649ee12f5a135fd4c912374b09723938a04908 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 Sep 2017 23:49:08 +0200 Subject: [PATCH] libgnomeui: fix compatibility with GLib Picked from #29392, like the parent commit. --- pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d30c38a2cfc..24cd851eef6 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, xorg, glib, pango +{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, xorg, glib, pango , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool , gnome_vfs, libgnome_keyring, libglade }: @@ -13,6 +13,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + (fetchpatch { + name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; + url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff; + sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ xorg.xlibsWrapper libxml2 GConf pango glib libgnome_keyring libglade libtool ];