diff options
| author | 宋文武 <iyzsong@gmail.com> | 2016-03-14 20:11:51 +0800 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-04-16 11:40:15 +0200 |
| commit | 05c4b7e930cd89ca05c2b3a559236c5995f3c07f (patch) | |
| tree | 2fa32db11e147d00cbe53fd7355ba7e3acdfc0e3 /gnu/packages/gtk.scm | |
| parent | 3a25c63120ccc0176eab8b7e88aa1dfe25acd163 (diff) | |
| download | guix-05c4b7e930cd89ca05c2b3a559236c5995f3c07f.tar guix-05c4b7e930cd89ca05c2b3a559236c5995f3c07f.tar.gz | |
gnu: gtk+: Enable SVG support.
* gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: Use 'gdk-pixbuf+svg'
instead of 'gdk-pixbuf'.
(gtk+): Remove librsvg from inputs. Remove 'wrap-gtk-encode-symbolic-svg' phase.
Diffstat (limited to 'gnu/packages/gtk.scm')
| -rw-r--r-- | gnu/packages/gtk.scm | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 255d885b27..793808f1e7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -559,7 +559,7 @@ is part of the GNOME accessibility project.") (outputs '("out" "doc")) (propagated-inputs `(("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("pango" ,pango))) (inputs `(("cups" ,cups) @@ -619,7 +619,7 @@ application suites.") (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf) + ("gdk-pixbuf" ,gdk-pixbuf+svg) ("libepoxy" ,libepoxy) ("libxcursor" ,libxcursor) ("libxi" ,libxi) @@ -627,8 +627,7 @@ application suites.") ("libxdamage" ,libxdamage) ("pango" ,pango))) (inputs - `(("librsvg" ,librsvg) ;for gtk-encode-symbolic-svg - ("libxml2" ,libxml2) + `(("libxml2" ,libxml2) ;; XXX: colord depends on mozjs (through polkit), which fails on ;; on non-intel systems now. ;;("colord" ,colord) @@ -663,18 +662,7 @@ application suites.") (("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk")) #t) - (alist-cons-after - 'install 'wrap-gtk-encode-symbolic-svg - ;; By using GdkPixbuf, gtk-encode-symbolic-svg needs to know - ;; librsvg's loaders.cache to handle SVG files. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/gtk-encode-symbolic-svg")) - (librsvg (assoc-ref inputs "librsvg")) - (loaders.cache (find-files librsvg "^loaders\\.cache$"))) - (wrap-program prog - `("GDK_PIXBUF_MODULE_FILE" = ,loaders.cache)))) - %standard-phases)))) + %standard-phases))) (native-search-paths (list (search-path-specification (variable "GUIX_GTK3_PATH") |