[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: sdl-mixer: Use correct inputs for MOD file support.
From: |
guix-commits |
Subject: |
01/05: gnu: sdl-mixer: Use correct inputs for MOD file support. |
Date: |
Sun, 5 Jan 2020 07:23:41 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit 5f50c2e6b19495d9fa01050f66b99d7bd3e19cc9
Author: Timotej Lazar <address@hidden>
Date: Sun Jan 5 11:45:47 2020 +0100
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 <address@hidden>
---
gnu/packages/sdl.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index f7a3400..beeec1b 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2019 Nicolas Goaziou <address@hidden>
;;; Copyright © 2019 Marius Bakke <address@hidden>
;;; Copyright © 2019 Pierre Neidhardt <address@hidden>
+;;; Copyright © 2020 Timotej Lazar <address@hidden>
;;;
;;; 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))))