aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-03-22 12:10:26 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-03-22 21:17:38 -0400
commitd0a64567f1218bec0de98e685c1e610e4a32038c (patch)
treeba6f902d3699eb1d23f5dc4665aa4bbbbd60481a /gnu
parent155f9afde5ce7f1aa72ee0e889d1f9d432896c41 (diff)
downloadguix-d0a64567f1218bec0de98e685c1e610e4a32038c.tar
guix-d0a64567f1218bec0de98e685c1e610e4a32038c.tar.gz
Revert "gnu: emacs: Byte compile the site-lisp directory."
This reverts commit 4714d0fc1a96eb6d421b64b0b585fe8043dcd07b. Rational: Having to rebuild Emacs every time (guix build emacs-utils) changes is not great.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/emacs.scm43
1 files changed, 4 insertions, 39 deletions
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index fd9c7fa875..794cbca38d 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -129,11 +129,6 @@
`(#:tests? #f ; no check target
#:configure-flags (list "--with-modules"
"--disable-build-details")
- #:modules ((guix build emacs-utils)
- (guix build glib-or-gtk-build-system)
- (guix build utils))
- #:imported-modules ((guix build emacs-utils)
- ,@%glib-or-gtk-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-before 'configure 'fix-/bin/pwd
@@ -148,8 +143,7 @@
;; Elisp packages found in EMACSLOADPATH.
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (lisp-dir (string-append out "/share/emacs/site-lisp"))
- (emacs (string-append out "/bin/emacs")))
+ (lisp-dir (string-append out "/share/emacs/site-lisp")))
(copy-file (assoc-ref inputs "guix-emacs.el")
(string-append lisp-dir "/guix-emacs.el"))
(with-output-to-file (string-append lisp-dir "/site-start.el")
@@ -162,9 +156,6 @@
;; share/emacs/site-lisp union when added to EMACSLOADPATH,
;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el"))
- ;; Byte compile the site-start files.
- (parameterize ((%emacs emacs))
- (emacs-byte-compile-directory lisp-dir))
#t))))))
(inputs
`(("gnutls" ,gnutls)
@@ -333,12 +324,6 @@ languages.")
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments emacs)
- ((#:modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
- ((#:imported-modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
((#:phases phases)
`(modify-phases ,phases
(delete 'install-site-start)))
@@ -358,12 +343,6 @@ editor (with xwidgets support)")
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments emacs)
- ((#:modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
- ((#:imported-modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
((#:configure-flags flags ''())
`(cons "--with-xwidgets" ,flags))))
(inputs
@@ -377,14 +356,6 @@ editor (with xwidgets support)")
(synopsis "The extensible, customizable, self-documenting text
editor (console only)")
(build-system gnu-build-system)
- (arguments
- (substitute-keyword-arguments (package-arguments emacs)
- ((#:modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
- ((#:imported-modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))))
(inputs (fold alist-delete
(package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
@@ -403,15 +374,9 @@ editor (without an X toolkit)" )
(inputs (append `(("inotify-tools" ,inotify-tools))
(alist-delete "gtk+" (package-inputs emacs))))
(arguments
- (substitute-keyword-arguments (package-arguments emacs)
- ((#:modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
- ((#:imported-modules _)
- `((guix build emacs-utils)
- ,@%gnu-build-system-modules))
- ((#:configure-flags cf)
- `(cons "--with-x-toolkit=no" ,cf))))))
+ `(,@(substitute-keyword-arguments (package-arguments emacs)
+ ((#:configure-flags cf)
+ `(cons "--with-x-toolkit=no" ,cf)))))))
(define-public guile-emacs
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")