nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Alex Kost 2016-05-12 00:41:12 +03:00
parent b2eaf7bacd
commit a6eafbed66
No known key found for this signature in database
GPG Key ID: 82460C082A0EE98F
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/packages/emacs.scm
View File

@ -1017,6 +1017,9 @@ as a library for other Emacs packages.")
(base32 (base32
"1pmki8hdjjikxlvip3pzi350bln3gcimr27yjf0xfwjvnp5hh9nc")))) "1pmki8hdjjikxlvip3pzi350bln3gcimr27yjf0xfwjvnp5hh9nc"))))
(build-system emacs-build-system) (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 (native-inputs
`(("perl" ,perl))) `(("perl" ,perl)))
(home-page "http://www.gnu.org/software/auctex/") (home-page "http://www.gnu.org/software/auctex/")

6
guix/build-system/emacs.scm
View File

@ -47,11 +47,7 @@
"Return the default Emacs package." "Return the default Emacs package."
;; Lazily resolve the binding to avoid a circular dependency. ;; Lazily resolve the binding to avoid a circular dependency.
(let ((emacs-mod (resolve-interface '(gnu packages emacs)))) (let ((emacs-mod (resolve-interface '(gnu packages emacs))))
;; we use 'emacs' instead of 'emacs-no-x' because the latter appears not (module-ref emacs-mod 'emacs-minimal)))
;; 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)))
(define* (lower name (define* (lower name
#:key source inputs native-inputs outputs system target #:key source inputs native-inputs outputs system target