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

gnu: solfege: Make configuration more robust to GC 

* gnu/packages/music.scm (solfege): Do not introduce store filenames in the
configuration skeleton.
[inputs]: Remove optional players.
This commit is contained in:
Nicolas Goaziou 2018-02-01 22:38:42 +01:00
parent 537a17fbe8
commit 95e545a4da
No known key found for this signature in database
GPG Key ID: A834B9E080A93738
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/music.scm
View File

@ -10,7 +10,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net> ;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org> ;;; Copyright © 2017 Rodger Fox <thylakoid@openmailbox.org>
;;; Copyright © 2017 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2017, 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2017 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -1050,22 +1050,10 @@ complete studio.")
(add-after 'unpack 'fix-configuration (add-after 'unpack 'fix-configuration
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "default.config" (substitute* "default.config"
(("csound=csound") (("/usr/bin/aplay" "aplay"))
(string-append "csound=" (("/usr/bin/timidity") "timidity")
(assoc-ref inputs "csound") (("/usr/bin/mpg123") "mpg123")
"/bin/csound")) (("/usr/bin/ogg123") "ogg123"))
(("/usr/bin/aplay")
(string-append (assoc-ref inputs "aplay")
"/bin/aplay"))
(("/usr/bin/timidity")
(string-append (assoc-ref inputs "timidity")
"/bin/timidity"))
(("/usr/bin/mpg123")
(string-append (assoc-ref inputs "mpg123")
"/bin/mpg123"))
(("/usr/bin/ogg123")
(string-append (assoc-ref inputs "ogg123")
"/bin/ogg123")))
#t)) #t))
(add-before 'build 'patch-python-shebangs (add-before 'build 'patch-python-shebangs
(lambda _ (lambda _
@ -1105,13 +1093,7 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
("pygtk" ,python2-pygtk) ("pygtk" ,python2-pygtk)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("gtk" ,gtk+) ("gtk" ,gtk+)
("lilypond" ,lilypond) ("lilypond" ,lilypond)))
;; players needed at runtime
("aplay" ,alsa-utils)
("csound" ,csound) ; optional, needed for some exercises
("mpg123" ,mpg123)
("ogg123" ,vorbis-tools)
("timidity" ,timidity++)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("txt2man" ,txt2man) ("txt2man" ,txt2man)