diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-04-15 15:03:21 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-04-15 17:21:23 +0200 |
commit | d4f97d5fed7c2358342c2d617398221b215a1568 (patch) | |
tree | bbdf0ce8670d6a24607cc2686f54d8a792602db2 /pkgs/desktops/gnome-2 | |
parent | 3bea518b36066c7cb002c4ec26e92e43ed3f4451 (diff) | |
download | nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.tar nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.tar.gz nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.tar.bz2 nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.tar.lz nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.tar.xz nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.tar.zst nixlib-d4f97d5fed7c2358342c2d617398221b215a1568.zip |
gnome2.gtkglext: patch deprecated symbols
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r-- | pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 8bbfde5e2086..834ec2201581 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pangox_compat ]; patches = [ + # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and + # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. + (fetchpatch { + name = "02_fix_gtk-2.20_deprecated_symbols.diff"; + url = https://git.gnome.org/browse/gtkglext/patch/?id=d8f285d1397f6c41099c67e668288eecc1cdae67; + sha256 = "1zxak73plhy3m6psil1q9ssvjh9aqrif7kcbcz69y480qfb4ja08"; + }) # Fix build with glibc ≥ 2.27 (fetchurl { url = https://salsa.debian.org/gewo/gtkglext/raw/3b002677c907890c7de002c9f5b4b3ec71d11b31/debian/patches/04_glibc2.27-ftbfs.diff; @@ -20,8 +27,6 @@ stdenv.mkDerivation rec { }) ]; - CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; - meta = with stdenv.lib; { homepage = https://projects.gnome.org/gtkglext/; description = "GtkGLExt, an OpenGL extension to GTK+"; |