diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2017-09-16 23:49:08 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-28 12:17:27 +0200 |
| commit | 13649ee12f5a135fd4c912374b09723938a04908 (patch) | |
| tree | 21975d8fadabea26f563a9a02dae4babbac75b55 /pkgs/desktops | |
| parent | d9d65fb275a455327a13a9caa1ee79580367ea76 (diff) | |
| download | nixlib-13649ee12f5a135fd4c912374b09723938a04908.tar nixlib-13649ee12f5a135fd4c912374b09723938a04908.tar.gz nixlib-13649ee12f5a135fd4c912374b09723938a04908.tar.bz2 nixlib-13649ee12f5a135fd4c912374b09723938a04908.tar.lz nixlib-13649ee12f5a135fd4c912374b09723938a04908.tar.xz nixlib-13649ee12f5a135fd4c912374b09723938a04908.tar.zst nixlib-13649ee12f5a135fd4c912374b09723938a04908.zip | |
libgnomeui: fix compatibility with GLib
Picked from #29392, like the parent commit.
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/gnome-2/platform/libgnomeui/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d30c38a2cfc4..24cd851eef6a 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 ]; |