nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: sdl2: Update to 2.0.7 and enable Wayland backend. 

* gnu/packages/sdl.scm (sdl2): Update to 2.0.7.
[inputs]: Add wayland, wayland-protocols, libxkbcommon.
[arguments]: Add '--disable-wayland-shared' to #:configure-flags.

Co-authored-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
Rutger Helling 2017-11-05 12:01:04 +01:00 committed by Marius Bakke
parent 7c5cc40097
commit 39f2433c39
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/sdl.scm
View File

@ -4,6 +4,7 @@
;;; Copyright © 2015, 2017 Sou Bunnbu <iyzsong@member.fsf.org> ;;; Copyright © 2015, 2017 Sou Bunnbu <iyzsong@member.fsf.org>
;;; Copyright © 2015 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -28,11 +29,13 @@
#:use-module ((guix licenses) #:hide (freetype)) #:use-module ((guix licenses) #:hide (freetype))
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages fcitx) #:use-module (gnu packages fcitx)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib) #:use-module (gnu packages glib)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages ibus) #:use-module (gnu packages ibus)
@ -42,6 +45,7 @@
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pulseaudio) #:use-module (gnu packages pulseaudio)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xiph) #:use-module (gnu packages xiph)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:export (sdl-union)) #:export (sdl-union))
@ -94,7 +98,7 @@ joystick, and graphics hardware.")
(define-public sdl2 (define-public sdl2
(package (inherit sdl) (package (inherit sdl)
(name "sdl2") (name "sdl2")
(version "2.0.5") (version "2.0.7")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -102,7 +106,12 @@ joystick, and graphics hardware.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"11c75qj1qxmx67iwkvf9z4x69phk301pdn86zzr6jncnap7kh824")))) "0pjdpxla5kh1w1b0shxrx97a116vyy31njxi0jhyvqhk8d6cfdgf"))))
(arguments
(substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags)
`(append '("--disable-wayland-shared")
,flags))))
(inputs (inputs
;; SDL2 needs to be built with ibus support otherwise some systems ;; SDL2 needs to be built with ibus support otherwise some systems
;; experience a bug where input events are doubled. ;; experience a bug where input events are doubled.
@ -111,7 +120,10 @@ joystick, and graphics hardware.")
(append `(("dbus" ,dbus) (append `(("dbus" ,dbus)
("fcitx" ,fcitx) ; helps with CJK input ("fcitx" ,fcitx) ; helps with CJK input
("glib" ,glib) ("glib" ,glib)
("ibus" ,ibus)) ("ibus" ,ibus)
("libxkbcommon", libxkbcommon)
("wayland", wayland)
("wayland-protocols", wayland-protocols))
(package-inputs sdl))) (package-inputs sdl)))
(license bsd-3))) (license bsd-3)))