nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
宋文武 2016-03-14 20:11:51 +08:00 committed by Ludovic Courtès
parent 3a25c63120
commit 05c4b7e930
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/gtk.scm
View File

@ -559,7 +559,7 @@ is part of the GNOME accessibility project.")
(outputs '("out" "doc")) (outputs '("out" "doc"))
(propagated-inputs (propagated-inputs
`(("atk" ,atk) `(("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf+svg)
("pango" ,pango))) ("pango" ,pango)))
(inputs (inputs
`(("cups" ,cups) `(("cups" ,cups)
@ -619,7 +619,7 @@ application suites.")
(propagated-inputs (propagated-inputs
`(("at-spi2-atk" ,at-spi2-atk) `(("at-spi2-atk" ,at-spi2-atk)
("atk" ,atk) ("atk" ,atk)
("gdk-pixbuf" ,gdk-pixbuf) ("gdk-pixbuf" ,gdk-pixbuf+svg)
("libepoxy" ,libepoxy) ("libepoxy" ,libepoxy)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxi" ,libxi) ("libxi" ,libxi)
@ -627,8 +627,7 @@ application suites.")
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
("pango" ,pango))) ("pango" ,pango)))
(inputs (inputs
`(("librsvg" ,librsvg) ;for gtk-encode-symbolic-svg `(("libxml2" ,libxml2)
("libxml2" ,libxml2)
;; XXX: colord depends on mozjs (through polkit), which fails on ;; XXX: colord depends on mozjs (through polkit), which fails on
;; on non-intel systems now. ;; on non-intel systems now.
;;("colord" ,colord) ;;("colord" ,colord)
@ -663,18 +662,7 @@ application suites.")
(("SUBDIRS = gdk gtk a11y css reftests") (("SUBDIRS = gdk gtk a11y css reftests")
"SUBDIRS = gdk")) "SUBDIRS = gdk"))
#t) #t)
(alist-cons-after %standard-phases)))
'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))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "GUIX_GTK3_PATH") (variable "GUIX_GTK3_PATH")