diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-05-30 08:56:36 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-05-30 08:57:33 +0200 |
| commit | 14e2f61adade2716f7c70e01b4a6cf8be36c6116 (patch) | |
| tree | 8f9e4cf227d657ce1cc3de790a18550432fdc8c3 /gnu/packages/gnome.scm | |
| parent | 341a36b32cf3525061ee6f96f8cbbcbe7a64848a (diff) | |
| download | guix-14e2f61adade2716f7c70e01b4a6cf8be36c6116.tar.gz | |
gnu: gtkglext: Fix build.
* gnu/packages/gnome.scm (gtkglext)[arguments]: Add build phase to fix name collision.
Diffstat (limited to 'gnu/packages/gnome.scm')
| -rw-r--r-- | gnu/packages/gnome.scm | 12 |
1 files changed, 11 insertions, 1 deletions
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 <mthl@openmailbox.org> ;;; Copyright © 2015, 2017 Andy Wingo <wingo@igalia.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 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il> @@ -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) |