aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/music.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2016-05-12 18:48:36 -0400
committerMark H Weaver <mhw@netris.org>2016-05-12 18:48:36 -0400
commit207c604637737408a3d4cd9214a9e69ce4b21bb3 (patch)
treec26225dd535e59866677b1dda1d1714b95f417a5 /gnu/packages/music.scm
parent11d7d7b5d399f38712eb68ab9a20e5dc0d6ef30e (diff)
parentef06d54a9b9ee4fb5015c78ab94f8df1d3a72f1d (diff)
downloadguix-207c604637737408a3d4cd9214a9e69ce4b21bb3.tar
guix-207c604637737408a3d4cd9214a9e69ce4b21bb3.tar.gz
Merge branch 'gnome-updates'
Diffstat (limited to 'gnu/packages/music.scm')
-rw-r--r--gnu/packages/music.scm12
1 files changed, 3 insertions, 9 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 7e0ea6210e..9a958a37ae 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -551,15 +551,11 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
(alist-cons-after
'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
- ;; Make sure 'solfege' runs with the correct PYTHONPATH. We
- ;; also need to modify GDK_PIXBUF_MODULE_FILE for SVG support.
+ ;; Make sure 'solfege' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH"))
- (rsvg (assoc-ref inputs "librsvg"))
- (pixbuf (find-files rsvg "^loaders\\.cache$")))
+ (path (getenv "PYTHONPATH")))
(wrap-program (string-append out "/bin/solfege")
- `("PYTHONPATH" ":" prefix (,path))
- `("GDK_PIXBUF_MODULE_FILE" ":" prefix ,pixbuf))))
+ `("PYTHONPATH" ":" prefix (,path)))))
%standard-phases)))))))
(inputs
`(("python" ,python-2)
@@ -567,8 +563,6 @@ for path in [path for path in sys.path if 'site-packages' in path]: site.addsite
("gettext" ,gnu-gettext)
("gtk" ,gtk+)
("lilypond" ,lilypond)
- ("librsvg" ,librsvg) ; needed at runtime for icons
- ("libpng" ,libpng) ; needed at runtime for icons
;; players needed at runtime
("aplay" ,alsa-utils)
("csound" ,csound) ; optional, needed for some exercises