me
/
guix
Archived
1
0
Fork 0
Code

gnu: Restore emacs' supported systems. 

Recently, librsvg was updated to depend upon rust.  That change inadvertently
restricted the "supported" systems of emacs (among other packages) to
x86_64-linux only, since that is the only system declared in the rust
package's list of supported systems.  This unintentionally made emacs
unavailable on all other systems.

This change fixes that by removing the rust dependency from some packages.
The packages remain unchanged from the perspective of an x86_64-linux system,
but from the perspective of other systems, the packages are now supported
again (albeit without certain optional SVG features).

* gnu/packages/gtk.scm (gtk+, gtk+-2)[propagated-inputs]: If compiling for
x86_64, use gdk-pixbuf+svg as the "gdk-pixbuf" input, as usual.  Otherwise,
use gdk-pixbuf, which avoids adding librsvg (thus rust) to the closure of
inputs.  Note that both gtk+ and gtk+-2 are in the transitive closure of
inputs of emacs, so these two changes are necessary.
* gnu/packages/emacs (emacs)[inputs]: If compiling for x86_64, add librsvg to
the inputs, as usual.  Otherwise, do not add it, which avoids adding rust to
the closure of inputs.
master
Chris Marusich 2021-03-08 23:13:39 -08:00
parent d4d132bc84
commit 5d2863dfe4
No known key found for this signature in database
GPG Key ID: DD409A15D822469D
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/emacs.scm
View File

@ -71,6 +71,7 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 match)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1))
(define-public emacs (define-public emacs
@ -236,7 +237,12 @@
("libpng" ,libpng) ("libpng" ,libpng)
("zlib" ,zlib) ("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) ("libxpm" ,libxpm)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libice" ,libice) ("libice" ,libice)

14
gnu/packages/gtk.scm
View File

@ -777,7 +777,12 @@ is part of the GNOME accessibility project.")
(outputs '("out" "bin" "doc")) (outputs '("out" "bin" "doc"))
(propagated-inputs (propagated-inputs
`(("atk" ,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))
("pango" ,pango))) ("pango" ,pango)))
(inputs (inputs
`(("cups" ,cups) `(("cups" ,cups)
@ -844,7 +849,12 @@ 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+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) ("libepoxy" ,libepoxy)
("libxcursor" ,libxcursor) ("libxcursor" ,libxcursor)
("libxi" ,libxi) ("libxi" ,libxi)