diff options
| author | Timotej Lazar <timotej.lazar@araneo.si> | 2020-01-05 11:45:47 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-01-05 13:08:45 +0100 |
| commit | 5f50c2e6b19495d9fa01050f66b99d7bd3e19cc9 (patch) | |
| tree | db5adc86f7012643e595a34b238dbf1f0543b5e2 /gnu/packages/sdl.scm | |
| parent | 7aa28eb339dd667d07cfb8b5347e159d5da3ccd7 (diff) | |
| download | guix-5f50c2e6b19495d9fa01050f66b99d7bd3e19cc9.tar guix-5f50c2e6b19495d9fa01050f66b99d7bd3e19cc9.tar.gz | |
gnu: sdl-mixer: Use correct inputs for MOD file support.
* 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>
Diffstat (limited to 'gnu/packages/sdl.scm')
| -rw-r--r-- | gnu/packages/sdl.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index f7a34003d1..beeec1b8ca 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> +;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; ;;; This file is part of GNU Guix. ;;; @@ -274,8 +275,7 @@ WEBP, XCF, XPM, and XV.") (inputs `(("libvorbis" ,libvorbis) ("libflac" ,flac) ("libmad" ,libmad) - ("libmikmod" ,libmikmod) - ("libmodplug" ,libmodplug))) + ("libmikmod" ,libmikmod))) ;; FIXME: Add libfluidsynth (propagated-inputs `(("sdl" ,sdl))) (synopsis "SDL multi-channel audio mixer library") @@ -416,6 +416,10 @@ directory.") #t)) (sha256 (base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) + (inputs + ;; The default MOD library changed in SDL2 mixer. + `(("libmodplug" ,libmodplug) + ,@(alist-delete "libmikmod" (package-inputs sdl-mixer)))) (propagated-inputs (propagated-inputs-with-sdl2 sdl-mixer)))) |