futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build-system: emacs: Simplify the SET-EMACS-LOAD-PATH phase.

Browse Source 
It is no longer necessary to search for the Elisp libraries manually, as Emacs
now include a search path specification serving that purpose.

* guix/build/emacs-build-system.scm (set-emacs-load-path): Replace by...
(add-source-to-load-path): ...this.
(%standard-phases): Adjust accordingly.
This commit is contained in:
Maxim Cournoyer 2019-10-28 08:09:03 -04:00
parent 215a45d9b8
commit e1d31e6457
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
;;; Copyright © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018, 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -74,40 +74,14 @@ archive, a directory, or an Emacs Lisp file."
#t) #t)
(gnu:unpack #:source source))) (gnu:unpack #:source source)))
(define* (set-emacs-load-path #:key source inputs #:allow-other-keys) (define* (add-source-to-load-path #:key dummy #:allow-other-keys)
(define (inputs->directories inputs) "Augment the EMACSLOADPATH environment variable with the source directory."
"Extract the directory part from INPUTS."
(match inputs
(((names . directories) ...) directories)))
(define (input-directory->el-directory input-directory)
"Return the correct Emacs Lisp directory in INPUT-DIRECTORY or #f, if there
is no Emacs Lisp directory."
(let ((legacy-elisp-directory (string-append input-directory %legacy-install-suffix))
(guix-elisp-directory
(string-append
input-directory %install-suffix "/"
(store-directory->elpa-name-version input-directory))))
(cond
((file-exists? guix-elisp-directory) guix-elisp-directory)
((file-exists? legacy-elisp-directory) legacy-elisp-directory)
(else #f))))
(define (input-directories->el-directories input-directories)
"Return the list of Emacs Lisp directories in INPUT-DIRECTORIES."
(filter-map input-directory->el-directory input-directories))
"Set the EMACSLOADPATH environment variable so that dependencies are found."
(let* ((source-directory (getcwd)) (let* ((source-directory (getcwd))
(input-elisp-directories (input-directories->el-directories (emacs-load-path-value (string-append (getenv "EMACSLOADPATH") ":"
(inputs->directories inputs))) source-directory)))
(emacs-load-path-value
(string-join
(append input-elisp-directories (list source-directory))
":" 'suffix)))
(setenv "EMACSLOADPATH" emacs-load-path-value) (setenv "EMACSLOADPATH" emacs-load-path-value)
(format #t "environment variable `EMACSLOADPATH' set to ~a\n" (format #t "source directory ~s appended to the `EMACSLOADPATH' \
emacs-load-path-value))) environment variable\n" source-directory)))
(define* (build #:key outputs inputs #:allow-other-keys) (define* (build #:key outputs inputs #:allow-other-keys)
"Compile .el files." "Compile .el files."
@ -269,7 +243,7 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages."
(define %standard-phases (define %standard-phases
(modify-phases gnu:%standard-phases (modify-phases gnu:%standard-phases
(replace 'unpack unpack) (replace 'unpack unpack)
(add-after 'unpack 'set-emacs-load-path set-emacs-load-path) (add-after 'unpack 'add-source-to-load-path add-source-to-load-path)
(delete 'bootstrap) (delete 'bootstrap)
(delete 'configure) (delete 'configure)
;; Move the build phase after install: the .el files are byte compiled ;; Move the build phase after install: the .el files are byte compiled