From 046a23e63a738e55c9358c58b5809bbd5f4b009e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 14 Dec 2021 11:18:46 -0500 Subject: 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. --- guix/build/emacs-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/build') 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 @@ (define* (expand-load-path #:key (prepend-source? #t) #:allow-other-keys) (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)) -- cgit v1.2.3