[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: build-system/emacs: Use 'emacs-minimal' by default.
From: |
Alex Kost |
Subject: |
03/06: build-system/emacs: Use 'emacs-minimal' by default. |
Date: |
Tue, 24 May 2016 08:47:53 +0000 (UTC) |
alezost pushed a commit to branch master
in repository guix.
commit a6eafbed665231e0f0fedeea8dbab491d20fa241
Author: Alex Kost <address@hidden>
Date: Thu May 12 00:41:12 2016 +0300
build-system/emacs: Use 'emacs-minimal' by default.
* guix/build-system/emacs.scm (default-emacs): Use 'emacs-minimal'.
* gnu/packages/emacs.scm (emacs-auctex): Use 'emacs'.
---
gnu/packages/emacs.scm | 3 +++
guix/build-system/emacs.scm | 6 +-----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 6240591..ba30ea1 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1017,6 +1017,9 @@ as a library for other Emacs packages.")
(base32
"1pmki8hdjjikxlvip3pzi350bln3gcimr27yjf0xfwjvnp5hh9nc"))))
(build-system emacs-build-system)
+ ;; We use 'emacs' because AUCTeX requires dbus at compile time
+ ;; ('emacs-minimal' does not provide dbus).
+ (arguments `(#:emacs ,emacs))
(native-inputs
`(("perl" ,perl)))
(home-page "http://www.gnu.org/software/auctex/")
diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm
index 03c1eb2..a798200 100644
--- a/guix/build-system/emacs.scm
+++ b/guix/build-system/emacs.scm
@@ -47,11 +47,7 @@
"Return the default Emacs package."
;; Lazily resolve the binding to avoid a circular dependency.
(let ((emacs-mod (resolve-interface '(gnu packages emacs))))
- ;; we use 'emacs' instead of 'emacs-no-x' because the latter appears not
- ;; to be loading some macros and causes problems to some packages. For
- ;; example, with the latter AUCTeX gives the error message:
- ;; "(invalid-function dbus-ignore-errors)".
- (module-ref emacs-mod 'emacs)))
+ (module-ref emacs-mod 'emacs-minimal)))
(define* (lower name
#:key source inputs native-inputs outputs system target
- branch master updated (d16479c -> 8eeb301), Alex Kost, 2016/05/24
- 03/06: build-system/emacs: Use 'emacs-minimal' by default.,
Alex Kost <=
- 04/06: gnu: Move emacs for building from inputs to native-inputs., Alex Kost, 2016/05/24
- 02/06: gnu: Add emacs-minimal., Alex Kost, 2016/05/24
- 01/06: gnu: emacs: Remove *.elc and autoloads from the tarball., Alex Kost, 2016/05/24
- 05/06: gnu: Use 'emacs-minimal' instead of 'emacs-no-x'., Alex Kost, 2016/05/24
- 06/06: gnu: Add emacs-clojure-mode., Alex Kost, 2016/05/24