diff options
| -rw-r--r-- | gnu/packages/emacs.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/gtk.scm | 14 |
2 files changed, 19 insertions, 3 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 98061c93ae..fe5b3b25b3 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -71,6 +71,7 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix utils) + #:use-module (ice-9 match) #:use-module (srfi srfi-1)) (define-public emacs @@ -236,7 +237,12 @@ ("libpng" ,libpng) ("zlib" ,zlib) - ("librsvg" ,librsvg) + ;; librsvg is an optional dependency that pulls in rust. Rust is not + ;; supported well on every architecture yet. + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + `(("librsvg" ,librsvg)) + '()) ("libxpm" ,libxpm) ("libxml2" ,libxml2) ("libice" ,libice) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 30ffb101ac..fbaacc11e4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -777,7 +777,12 @@ is part of the GNOME accessibility project.") (outputs '("out" "bin" "doc")) (propagated-inputs `(("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ;; SVG support is optional and requires librsvg, which pulls in rust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + gdk-pixbuf+svg + gdk-pixbuf)) ("pango" ,pango))) (inputs `(("cups" ,cups) @@ -844,7 +849,12 @@ application suites.") (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) - ("gdk-pixbuf" ,gdk-pixbuf+svg) + ;; SVG support is optional and requires librsvg, which pulls in rust. + ;; Rust is not supported well on every architecture yet. + ("gdk-pixbuf" ,(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + gdk-pixbuf+svg + gdk-pixbuf)) ("libepoxy" ,libepoxy) ("libxcursor" ,libxcursor) ("libxi" ,libxi) |