me/guix
Archived
1
0
Fork 0
Code Activity

gnu: gtkglext: Fix build.

Browse source 
* gnu/packages/gnome.scm (gtkglext)[arguments]: Add build phase to fix name
collision.
This commit is contained in:
Ricardo Wurmus 2018-05-30 08:56:36 +02:00
parent 341a36b32c
commit 14e2f61ada
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/gnome.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org> ;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
;;; Copyright © 2015, 2017 Andy Wingo <wingo@igalia.com> ;;; Copyright © 2015, 2017 Andy Wingo <wingo@igalia.com>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
@ -1070,6 +1070,16 @@ API.")
(patches (search-patches (patches (search-patches
"gtkglext-disable-disable-deprecated.patch")))) "gtkglext-disable-disable-deprecated.patch"))))
(build-system gnu-build-system) (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) (inputs `(("gtk+" ,gtk+-2)
("mesa" ,mesa) ("mesa" ,mesa)
("glu" ,glu) ("glu" ,glu)