rekado pushed a commit to branch core-updates
in repository guix.
commit 14e2f61adade2716f7c70e01b4a6cf8be36c6116
Author: Ricardo Wurmus <[email protected]>
Date: Wed May 30 08:56:36 2018 +0200
gnu: gtkglext: Fix build.
* gnu/packages/gnome.scm (gtkglext)[arguments]: Add build phase to fix name
collision.
---
gnu/packages/gnome.scm | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d04f405..3fde848 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8,7 +8,7 @@
;;; Copyright © 2015 Mathieu Lirzin <[email protected]>
;;; Copyright © 2015, 2017 Andy Wingo <[email protected]>
;;; Copyright © 2015 David Hashe <[email protected]>
-;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <[email protected]>
+;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <[email protected]>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2015 David Thompson <[email protected]>
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <[email protected]>
@@ -1070,6 +1070,16 @@ API.")
(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)
