diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 23:16:55 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-23 23:16:55 +0100 |
commit | 8c14f7f8a7ab0722bf4c9f92fd28ae85514d564f (patch) | |
tree | adc5d29e9c2dcda5befa0ca81f1af8df23294947 /gnu/packages/sdl.scm | |
parent | 2f33a7321e5e37d37f57c229c8079cb4ffd10834 (diff) | |
parent | 3374e9207f5244c20402a3c5513fe562140fef47 (diff) | |
download | patches-8c14f7f8a7ab0722bf4c9f92fd28ae85514d564f.tar patches-8c14f7f8a7ab0722bf4c9f92fd28ae85514d564f.tar.gz |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r-- | gnu/packages/sdl.scm | 7 |
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))) |