summaryrefslogtreecommitdiff
path: root/gnu/packages/sdl.scm
diff options
context:
space:
mode:
authorRutger Helling <rhelling@mykolab.com>2019-03-19 10:45:16 +0100
committerRutger Helling <rhelling@mykolab.com>2019-03-19 10:49:45 +0100
commitf6dadee4263bcc5cd97447c92b766ef7cca661ec (patch)
treec7aa41b4509bbfb7e235281258d9490e20b0caef /gnu/packages/sdl.scm
parent34b81a9cddcfd4b5b2aa041d644833e2211da8c9 (diff)
gnu: mesa: Update to 18.3.5.
* gnu/packages/gl.scm (mesa): Update to 18.3.5. [build-system]: Switch to meson-build-system. [native-inputs]: Add "bison", "flex" and "gettext-minimal". [arguments]: Adjust arguments to Meson. * gnu/packages/sdl.scm (sdl)[propogated-inputs]: Add mesa. [inputs]: Remove mesa.
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r--gnu/packages/sdl.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 8d2a024378..fe01086a86 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -87,10 +87,13 @@
(propagated-inputs
;; SDL headers include X11 headers.
`(("libx11" ,libx11)
- ("libcap" ,libcap))) ; 'libSDL.la' contain `-lcap'.
+ ("libcap" ,libcap) ; 'libSDL.la' contain `-lcap'.
+ ;; TODO: Since building Mesa with Meson it is now necessary that Mesa is
+ ;; a propogated input. We still need to figure out why, possibly due to a
+ ;; change in pkg-config.
+ ("mesa" ,mesa)))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("libxrandr" ,libxrandr)
- ("mesa" ,mesa)
("glu" ,glu)
("alsa-lib" ,alsa-lib)
("pulseaudio" ,pulseaudio)))