diff mbox

[2/4] build-system/emacs: Use 'emacs-minimal' by default.

Message ID 1463831875-28373-3-git-send-email-alezost@gmail.com
State New
Headers show

Commit Message

Alex Kost May 21, 2016, 11:57 a.m. UTC 
* 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(-)

Comments

Ludovic Courtès May 22, 2016, 8:31 p.m. UTC | #1 
Alex Kost <alezost@gmail.com> skribis:

> * guix/build-system/emacs.scm (default-emacs): Use 'emacs-minimal'.
> * gnu/packages/emacs.scm (emacs-auctex): Use 'emacs'.

Perfect!

(The other patches in the series are still fine, of course.)

Thank you!

Ludo’.
Alex Kost May 24, 2016, 8:59 a.m. UTC | #2 
Ludovic Courtès (2016-05-22 23:31 +0300) wrote:

> Alex Kost <alezost@gmail.com> skribis:
>
>> * guix/build-system/emacs.scm (default-emacs): Use 'emacs-minimal'.
>> * gnu/packages/emacs.scm (emacs-auctex): Use 'emacs'.
>
> Perfect!
>
> (The other patches in the series are still fine, of course.)
>
> Thank you!

I have committed this patchset, thanks for looking at it.
diff mbox

Patch

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index c032869..fb1a3db 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1006,6 +1006,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