ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-15 23:48:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: emacs: Byte compile the site-lisp directory."

Browse source 
This reverts commit 4714d0fc1a.

Rational: Having to rebuild Emacs every time (guix build emacs-utils) changes
is not great.
This commit is contained in:
Maxim Cournoyer 2020-03-22 12:10:26 -04:00
parent 155f9afde5
commit d0a64567f1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 4 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gnu/packages/emacs.scm
View file

@ -129,11 +129,6 @@ (define-public emacs
`(#:tests? #f ; no check target `(#:tests? #f ; no check target
#:configure-flags (list "--with-modules" #:configure-flags (list "--with-modules"
"--disable-build-details") "--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 #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'fix-/bin/pwd (add-before 'configure 'fix-/bin/pwd
@ -148,8 +143,7 @@ (define-public emacs
;; Elisp packages found in EMACSLOADPATH. ;; Elisp packages found in EMACSLOADPATH.
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lisp-dir (string-append out "/share/emacs/site-lisp")) (lisp-dir (string-append out "/share/emacs/site-lisp")))
(emacs (string-append out "/bin/emacs")))
(copy-file (assoc-ref inputs "guix-emacs.el") (copy-file (assoc-ref inputs "guix-emacs.el")
(string-append lisp-dir "/guix-emacs.el")) (string-append lisp-dir "/guix-emacs.el"))
(with-output-to-file (string-append lisp-dir "/site-start.el") (with-output-to-file (string-append lisp-dir "/site-start.el")
@ -162,9 +156,6 @@ (define-public emacs
;; share/emacs/site-lisp union when added to EMACSLOADPATH, ;; share/emacs/site-lisp union when added to EMACSLOADPATH,
;; which leads to conflicts. ;; which leads to conflicts.
(delete-file (string-append lisp-dir "/subdirs.el")) (delete-file (string-append lisp-dir "/subdirs.el"))
;; Byte compile the site-start files.
(parameterize ((%emacs emacs))
(emacs-byte-compile-directory lisp-dir))
#t)))))) #t))))))
(inputs (inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
@ -333,12 +324,6 @@ (define-public emacs-minimal
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs) (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) ((#:phases phases)
`(modify-phases ,phases `(modify-phases ,phases
(delete 'install-site-start))) (delete 'install-site-start)))
@ -358,12 +343,6 @@ (define-public emacs-xwidgets
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs) (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 ''()) ((#:configure-flags flags ''())
`(cons "--with-xwidgets" ,flags)))) `(cons "--with-xwidgets" ,flags))))
(inputs (inputs
@ -377,14 +356,6 @@ (define-public emacs-no-x
(synopsis "The extensible, customizable, self-documenting text (synopsis "The extensible, customizable, self-documenting text
editor (console only)") editor (console only)")
(build-system gnu-build-system) (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 (inputs (fold alist-delete
(package-inputs emacs) (package-inputs emacs)
'("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg" '("libx11" "gtk+" "libxft" "libtiff" "giflib" "libjpeg"
@ -403,15 +374,9 @@ (define-public emacs-no-x-toolkit
(inputs (append `(("inotify-tools" ,inotify-tools)) (inputs (append `(("inotify-tools" ,inotify-tools))
(alist-delete "gtk+" (package-inputs emacs)))) (alist-delete "gtk+" (package-inputs emacs))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments emacs) `(,@(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) ((#:configure-flags cf)
`(cons "--with-x-toolkit=no" ,cf)))))) `(cons "--with-x-toolkit=no" ,cf)))))))
(define-public guile-emacs (define-public guile-emacs
(let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")