From f3045a5ba3da10bc971075ea206e55e8d21f5422 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Thu, 28 Apr 2016 12:13:26 +0800 Subject: gnu: librsvg: Drop 'loaders.cache' file. This is a followup to 05c4b7e93. * gnu/packages/gnome.scm (librsvg)[arguments]: Don't install 'loaders.cache' file. * gnu/packages/gnome.scm (gnome-themes-standard), gnu/packages/key-mon.scm (keymon), gnu/packages/music.scm (solfege): Remove wrap phase for SVG support. --- gnu/packages/music.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/music.scm') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 95f52c5dd6..346fefccdb 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -548,15 +548,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) @@ -564,8 +560,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 -- cgit v1.2.3