diff options
| author | Alex Kost <alezost@gmail.com> | 2016-05-12 00:41:12 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2016-05-24 11:32:27 +0300 |
| commit | a6eafbed665231e0f0fedeea8dbab491d20fa241 (patch) | |
| tree | cdc5966b4efc7ce730cdee0e1886e00cb4924b6c | |
| parent | b2eaf7bacd86d962d6e6ae0efa755741d1b781c8 (diff) | |
| download | guix-a6eafbed665231e0f0fedeea8dbab491d20fa241.tar guix-a6eafbed665231e0f0fedeea8dbab491d20fa241.tar.gz | |
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'.
| -rw-r--r-- | gnu/packages/emacs.scm | 3 | ||||
| -rw-r--r-- | 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 624059105f..ba30ea138c 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 03c1eb2baf..a7982002b6 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 |