[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: solfege: Make configuration more robust to GC
From: |
Nicolas Goaziou |
Subject: |
01/01: gnu: solfege: Make configuration more robust to GC |
Date: |
Thu, 1 Feb 2018 16:38:53 -0500 (EST) |
ngz pushed a commit to branch master
in repository guix.
commit 95e545a4dafe82499c68625e0c145df45ac38484
Author: Nicolas Goaziou <address@hidden>
Date: Thu Feb 1 22:38:42 2018 +0100
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.
---
gnu/packages/music.scm | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 2fb62d0..2e8bc17 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -10,7 +10,7 @@
;;; Copyright © 2016 Alex Griffin <address@hidden>
;;; Copyright © 2017 ng0 <address@hidden>
;;; Copyright © 2017 Rodger Fox <address@hidden>
-;;; Copyright © 2017 Nicolas Goaziou <address@hidden>
+;;; Copyright © 2017, 2018 Nicolas Goaziou <address@hidden>
;;; Copyright © 2017 Pierre Langlois <address@hidden>
;;; Copyright © 2017 Arun Isaac <address@hidden>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
@@ -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)