[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
26/26: gnu: emacs: Use librsvg and gtk+ on x86_64-linux only.
From: |
guix-commits |
Subject: |
26/26: gnu: emacs: Use librsvg and gtk+ on x86_64-linux only. |
Date: |
Sun, 7 Mar 2021 22:00:19 -0500 (EST) |
marusich pushed a commit to branch wip-ppc64le
in repository guix.
commit 82d2419bb4401e43fa54381764a8dfa0eaf207f5
Author: Chris Marusich <cmmarusich@gmail.com>
AuthorDate: Sun Mar 7 17:42:37 2021 -0800
gnu: emacs: Use librsvg and gtk+ on x86_64-linux only.
* gnu/packages/emacs.scm (emacs)[inputs]: Only add librsvg when the
%current-target-system or %current-system is "x86_64-linux". This avoids
pulling rust into the transitive closure of inputs on systems where Rust
support is currently lacking.
---
gnu/packages/emacs.scm | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 98061c9..f0797ae 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
@@ -219,7 +220,6 @@
;; TODO: Add the optional dependencies.
("libx11" ,libx11)
- ("gtk+" ,gtk+)
("cairo" ,cairo)
("pango" ,pango)
("harfbuzz" ,harfbuzz)
@@ -236,7 +236,6 @@
("libpng" ,libpng)
("zlib" ,zlib)
- ("librsvg" ,librsvg)
("libxpm" ,libxpm)
("libxml2" ,libxml2)
("libice" ,libice)
@@ -246,7 +245,15 @@
;; multilingualization support
("libotf" ,libotf)
- ("m17n-lib" ,m17n-lib)))
+ ("m17n-lib" ,m17n-lib)
+
+ ;; These are optional dependencies that pull in rust. Rust is not
+ ;; supported well on every architecture yet.
+ ,@(match (or (%current-target-system)
+ (%current-system))
+ ("x86_64-linux" `(("gtk+" ,gtk+)
+ ("librsvg" ,librsvg)))
+ (_ '()))))
(native-inputs
`(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el"))
("pkg-config" ,pkg-config)
- 10/26: gnu: texlive-bin: Fix compilation on powerpc64le*., (continued)
- 10/26: gnu: texlive-bin: Fix compilation on powerpc64le*., guix-commits, 2021/03/07
- 13/26: Add powerpc64le-linux as a supported Guix architecture., guix-commits, 2021/03/07
- 14/26: syscalls: Fix clone on powerpc64le-linux., guix-commits, 2021/03/07
- 16/26: ci: %cross-targets: Add powerpc64le-linux-gnu., guix-commits, 2021/03/07
- 17/26: utils: Fix target-64bit? on powerpc64le-linux., guix-commits, 2021/03/07
- 18/26: tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty., guix-commits, 2021/03/07
- 19/26: tests: pack: Fix %gzip-compressor and a failing test., guix-commits, 2021/03/07
- 20/26: gnu: commencement: Fix findutils-boot0 on some systems., guix-commits, 2021/03/07
- 21/26: gnu: gcc: Set gcc-8 as default., guix-commits, 2021/03/07
- 22/26: .guix-authorizations: Add lle_bout., guix-commits, 2021/03/07
- 26/26: gnu: emacs: Use librsvg and gtk+ on x86_64-linux only.,
guix-commits <=