summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-12-14 11:18:46 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-12-14 11:18:46 -0500
commit046a23e63a738e55c9358c58b5809bbd5f4b009e (patch)
tree3aabccac2acb144bd48cbe0d79483fd55dd25240
parent9ebeba825448c72ac13c37b4d9ddd6275bc801fb (diff)
downloadguix-046a23e63a738e55c9358c58b5809bbd5f4b009e.tar.gz
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.
-rw-r--r--guix/build/emacs-build-system.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm
index e08ac32615..ab77e57f33 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -110,7 +110,7 @@ environment variable\n" source-directory))
 
 (define* (build #:key outputs inputs #:allow-other-keys)
   "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")))
     (setenv "SHELL" "sh")
     (parameterize ((%emacs emacs))