build-system: emacs: Do not rely on input labels in the 'build' phase.

This commit repairs the Emacs build system for packages using the new
label-less "guix style".  Tested with emacs-libgit.

* guix/build/emacs-build-system.scm (build): Use search-input-file to locate
emacs.
This commit is contained in:
Maxim Cournoyer 2021-12-14 11:18:46 -05:00
parent 9ebeba8254
commit 046a23e63a
No known key found for this signature in database
GPG Key ID: 1260E46482E63562

View File

@ -110,7 +110,7 @@ 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."
(let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")) (let* ((emacs (search-input-file inputs "/bin/emacs"))
(out (assoc-ref outputs "out"))) (out (assoc-ref outputs "out")))
(setenv "SHELL" "sh") (setenv "SHELL" "sh")
(parameterize ((%emacs emacs)) (parameterize ((%emacs emacs))