aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2018-03-29 20:52:41 -0400
committerArun Isaac <arunisaac@systemreboot.net>2018-04-20 00:49:47 +0530
commitb5904fcc34596e0aabb85020808b746e4c8b39a0 (patch)
tree9b0b1dc96aed8d15aa497f4995d552cd96155685
parent2bb915e679b8a9e071f15b4caa3274fe9c6396c1 (diff)
downloadguix-b5904fcc34596e0aabb85020808b746e4c8b39a0.tar
guix-b5904fcc34596e0aabb85020808b746e4c8b39a0.tar.gz
build-system: emacs: Search all inputs for Emacs Lisp directories.
* guix/build/emacs-build-system.scm (set-emacs-load-path): Include Emacs Lisp directories from all inputs. Also, add the unpacked source directory to EMACSLOADPATH. (emacs-inputs, emacs-inputs-directories, emacs-input->el-directory, emacs-inputs-el-directories): Remove. (%standard-phases): Move set-emacs-load-path phase to after unpack phase. Signed-off-by: Arun Isaac <arunisaac@systemreboot.net>
-rw-r--r--guix/build/emacs-build-system.scm71
1 files changed, 31 insertions, 40 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index b779847424..41c0142cd9 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -74,12 +74,37 @@ archive, a directory, or an Emacs Lisp file."
#t)
(gnu:unpack #:source source)))
-(define* (set-emacs-load-path #:key inputs #:allow-other-keys)
+(define* (set-emacs-load-path #:key source inputs #:allow-other-keys)
+ (define (inputs->directories inputs)
+ "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* ((input-elisp-dirs (emacs-inputs-el-directories
- (emacs-inputs-directories inputs)))
- (emacs-load-path-value (string-join
- input-elisp-dirs ":" 'suffix)))
+ (let* ((source-directory (getcwd))
+ (input-elisp-directories (input-directories->el-directories
+ (inputs->directories inputs)))
+ (emacs-load-path-value
+ (string-join
+ (append input-elisp-directories (list source-directory))
+ ":" 'suffix)))
(setenv "EMACSLOADPATH" emacs-load-path-value)
(format #t "environment variable `EMACSLOADPATH' set to ~a\n"
emacs-load-path-value)))
@@ -210,40 +235,6 @@ store in '.el' files."
"Check if NAME correspond to the name of an Emacs package."
(string-prefix? "emacs-" name))
-(define (emacs-inputs inputs)
- "Retrieve the list of Emacs packages from INPUTS."
- (filter (match-lambda
- ((label . directory)
- (emacs-package? ((compose package-name->name+version
- strip-store-file-name)
- directory)))
- (_ #f))
- inputs))
-
-(define (emacs-inputs-directories inputs)
- "Extract the list of Emacs package directories from INPUTS."
- (let ((inputs (emacs-inputs inputs)))
- (match inputs
- (((names . directories) ...) directories))))
-
-(define (emacs-input->el-directory emacs-input)
- "Return the correct Elisp directory location of EMACS-INPUT or #f if none."
- (let ((legacy-elisp-dir (string-append emacs-input %legacy-install-suffix))
- (guix-elisp-dir (string-append
- emacs-input %install-suffix "/"
- (store-directory->elpa-name-version emacs-input))))
- (cond
- ((file-exists? guix-elisp-dir) guix-elisp-dir)
- ((file-exists? legacy-elisp-dir) legacy-elisp-dir)
- (else (format #t "warning: could not locate elisp directory under `~a'\n"
- emacs-input)
- #f))))
-
-(define (emacs-inputs-el-directories dirs)
- "Build the list of Emacs Lisp directories from the Emacs package directory
-DIRS."
- (filter-map emacs-input->el-directory dirs))
-
(define (package-name-version->elpa-name-version name-ver)
"Convert the Guix package NAME-VER to the corresponding ELPA name-version
format. Essentially drop the prefix used in Guix."
@@ -260,8 +251,8 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages."
(define %standard-phases
(modify-phases gnu:%standard-phases
- (add-after 'set-paths 'set-emacs-load-path set-emacs-load-path)
(replace 'unpack unpack)
+ (add-after 'unpack 'set-emacs-load-path set-emacs-load-path)
(delete 'configure)
;; Move the build phase after install: the .el files are byte compiled
;; directly in the store.