From a6eafbed665231e0f0fedeea8dbab491d20fa241 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 12 May 2016 00:41:12 +0300 Subject: [PATCH] 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 624059105fa7c6debba5181fff93c7530a68a9cc..ba30ea138c8dfe7b36716f1e5aa718e757283fbe 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 03c1eb2bafa77bf50339e7b3863cfefe21bffe98..a7982002b69561d20038aa78ebe7d7102f8d0178 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