summaryrefslogtreecommitdiff
path: root/gnu/packages/music.scm
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-01 22:38:42 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-01 22:38:42 +0100
commit95e545a4dafe82499c68625e0c145df45ac38484 (patch)
tree8eab72bb2210779a5c313e1c534f7e1b02c606f7 /gnu/packages/music.scm
parent537a17fbe89c3102b7b6d95616a7ce0b5e3ce209 (diff)
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.
Diffstat (limited to 'gnu/packages/music.scm')
-rw-r--r--gnu/packages/music.scm30
1 files changed, 6 insertions, 24 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2fb62d0ecf..2e8bc17192 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 ng0 <contact.ng0@cryptolab.net>
;;; 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 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -1050,22 +1050,10 @@ complete studio.")
(add-after 'unpack 'fix-configuration
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "default.config"
- (("csound=csound")
- (string-append "csound="
- (assoc-ref inputs "csound")
- "/bin/csound"))
- (("/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")))
+ (("/usr/bin/aplay" "aplay"))
+ (("/usr/bin/timidity") "timidity")
+ (("/usr/bin/mpg123") "mpg123")
+ (("/usr/bin/ogg123") "ogg123"))
#t))
(add-before 'build 'patch-python-shebangs
(lambda _
@@ -1105,13 +1093,7 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
("pygtk" ,python2-pygtk)
("gettext" ,gettext-minimal)
("gtk" ,gtk+)
- ("lilypond" ,lilypond)
- ;; players needed at runtime
- ("aplay" ,alsa-utils)
- ("csound" ,csound) ; optional, needed for some exercises
- ("mpg123" ,mpg123)
- ("ogg123" ,vorbis-tools)
- ("timidity" ,timidity++)))
+ ("lilypond" ,lilypond)))
(native-inputs
`(("pkg-config" ,pkg-config)
("txt2man" ,txt2man)