diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-04 22:31:59 +0100 |
commit | 4f8dc1536adf5965597d53a1e7867690429a12b2 (patch) | |
tree | 1d6456941b23316020c9f0edac8e22187134488d /gnu/packages/sdl.scm | |
parent | 19464173bafdc42adfc8dd7277c491c40ddef66b (diff) | |
parent | 5ae458befc803fe357210fef343cf322d9f4bade (diff) | |
download | guix-4f8dc1536adf5965597d53a1e7867690429a12b2.tar guix-4f8dc1536adf5965597d53a1e7867690429a12b2.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r-- | gnu/packages/sdl.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 7c7b7e7350..8d2a024378 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015, 2017 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com> +;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> @@ -117,7 +117,8 @@ joystick, and graphics hardware.") (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) - `(append '("--disable-wayland-shared") + `(append '("--disable-wayland-shared" "--enable-video-kmsdrm" + "--disable-kmsdrm-shared") ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems |