diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d04f40548f..3fde8487dd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2015 Mathieu Lirzin ;;; Copyright © 2015, 2017 Andy Wingo ;;; Copyright © 2015 David Hashe -;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 David Thompson ;;; Copyright © 2015, 2016, 2017 Efraim Flashner @@ -1070,6 +1070,16 @@ (define-public gtkglext (patches (search-patches "gtkglext-disable-disable-deprecated.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Fix a collision between a local variable and a definition from + ;; glibc's string.h. + (add-after 'unpack 'fix-collision + (lambda _ + (substitute* "gdk/gdkglshapes.c" + ((" index") " triangle_index")) + #t))))) (inputs `(("gtk+" ,gtk+-2) ("mesa" ,mesa) ("glu" ,glu)