me
/
guix
Archived
1
0
Fork 0
Code

gnu: mutter: Fix build with Mesa 20. 

* gnu/packages/gnome.scm (mutter)[arguments]: Add #:phases.
master
Marius Bakke 2020-05-23 11:22:45 +02:00 committed by Marius Bakke
parent 76623b6703
commit 682ae6f947
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/gnome.scm
View File

@ -6084,7 +6084,21 @@ to display dialog boxes from the commandline and shell scripts.")
;; the remaining flags are needed for the bundled cogl ;; the remaining flags are needed for the bundled cogl
(string-append "-Dopengl_libname=" (string-append "-Dopengl_libname="
(assoc-ref %build-inputs "mesa") (assoc-ref %build-inputs "mesa")
"/lib/libGL.so")))) "/lib/libGL.so"))
#:phases (modify-phases %standard-phases
(add-after 'unpack 'fix-build-with-mesa-20
(lambda _
;; Mimic upstream commit a444a4c5f58ea516ad for
;; compatibility with Mesa 20. Remove for 3.36.
(substitute* '("src/backends/meta-egl-ext.h"
"src/backends/meta-egl.c"
"src/backends/meta-egl.h")
(("#include <EGL/eglext\\.h>" all)
(string-append all "\n#include <EGL/eglmesaext.h>")))
(substitute* "cogl/cogl/meson.build"
(("#include <EGL/eglext\\.h>" all)
(string-append all "\\n#include <EGL/eglmesaext.h>")))
#t)))))
(native-inputs (native-inputs
`(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc. ("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.