me/guix
Archived
1
0
Fork 0
Code Activity

gnu: sdl-mixer: Use correct inputs for MOD file support.

Browse source 
* gnu/packages/sdl.scm (sdl-mixer)[inputs]: Remove libmodplug.
* gnu/packages/sdl.scm (sdl2-mixer)[inputs]: Add libmodplug.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Timotej Lazar 2020-01-05 11:45:47 +01:00 • committed by Danny Milosavljevic
parent 7aa28eb339
commit 5f50c2e6b1
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/sdl.scm
View file

@ -11,6 +11,7 @@
;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -274,8 +275,7 @@ WEBP, XCF, XPM, and XV.")
(inputs `(("libvorbis" ,libvorbis) (inputs `(("libvorbis" ,libvorbis)
("libflac" ,flac) ("libflac" ,flac)
("libmad" ,libmad) ("libmad" ,libmad)
("libmikmod" ,libmikmod) ("libmikmod" ,libmikmod)))
("libmodplug" ,libmodplug)))
;; FIXME: Add libfluidsynth ;; FIXME: Add libfluidsynth
(propagated-inputs `(("sdl" ,sdl))) (propagated-inputs `(("sdl" ,sdl)))
(synopsis "SDL multi-channel audio mixer library") (synopsis "SDL multi-channel audio mixer library")
@ -416,6 +416,10 @@ directory.")
#t)) #t))
(sha256 (sha256
(base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl"))))
(inputs
;; The default MOD library changed in SDL2 mixer.
`(("libmodplug" ,libmodplug)
,@(alist-delete "libmikmod" (package-inputs sdl-mixer))))
(propagated-inputs (propagated-inputs
(propagated-inputs-with-sdl2 sdl-mixer)))) (propagated-inputs-with-sdl2 sdl-mixer))))