guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: build-system: emacs: Do not rely on input labels in the 'build' p


From: guix-commits
Subject: 02/02: build-system: emacs: Do not rely on input labels in the 'build' phase.
Date: Tue, 14 Dec 2021 11:27:25 -0500 (EST)

apteryx pushed a commit to branch master
in repository guix.

commit 046a23e63a738e55c9358c58b5809bbd5f4b009e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Dec 14 11:18:46 2021 -0500

    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(-)

diff --git a/guix/build/emacs-build-system.scm 
b/guix/build/emacs-build-system.scm
index e08ac32..ab77e57 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]