diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:01:00 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-11-19 15:01:00 +0100 |
| commit | 2dd12924cf4a30a96262b6d392fcde58c9f10d4b (patch) | |
| tree | 3f74f5426ff214a02b8f6652f6516979657a7f98 /gnu/packages/sdl.scm | |
| parent | 259b4f34ba2eaefeafdb7c9f9eb56ee77f16010c (diff) | |
| parent | a93447b89a5b132221072e729d13a3f17391b8c2 (diff) | |
| download | guix-2dd12924cf4a30a96262b6d392fcde58c9f10d4b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/sdl.scm')
| -rw-r--r-- | gnu/packages/sdl.scm | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index d3edac14ff..e4e0fdb779 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -4,6 +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 Rutger Helling <rhelling@mykolab.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -28,11 +29,13 @@ #:use-module ((guix licenses) #:hide (freetype)) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (gnu packages audio) #:use-module (gnu packages fcitx) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages guile) #:use-module (gnu packages ibus) @@ -42,6 +45,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages gl) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) #:export (sdl-union)) @@ -94,7 +98,7 @@ joystick, and graphics hardware.") (define-public sdl2 (package (inherit sdl) (name "sdl2") - (version "2.0.5") + (version "2.0.7") (source (origin (method url-fetch) (uri @@ -102,7 +106,12 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824")))) + "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf")))) + (arguments + (substitute-keyword-arguments (package-arguments sdl) + ((#:configure-flags flags) + `(append '("--disable-wayland-shared") + ,flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems ;; experience a bug where input events are doubled. @@ -111,7 +120,10 @@ joystick, and graphics hardware.") (append `(("dbus" ,dbus) ("fcitx" ,fcitx) ; helps with CJK input ("glib" ,glib) - ("ibus" ,ibus)) + ("ibus" ,ibus) + ("libxkbcommon", libxkbcommon) + ("wayland", wayland) + ("wayland-protocols", wayland-protocols)) (package-inputs sdl))) (license bsd-3))) |