guix-commits
[Top][All Lists]
Advanced

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

branch master updated: guix: Do not assume "emacs" label in make-autoloa


From: guix-commits
Subject: branch master updated: guix: Do not assume "emacs" label in make-autoloads.
Date: Tue, 14 Dec 2021 09:48:20 -0500

This is an automated email from the git hooks/post-receive script.

ngz pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 6717ce2  guix: Do not assume "emacs" label in make-autoloads.
6717ce2 is described below

commit 6717ce28d066c7ead4dfb3538930ca74c1bac523
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
AuthorDate: Tue Dec 14 15:48:02 2021 +0100

    guix: Do not assume "emacs" label in make-autoloads.
    
    * guix/build/emacs-build-system.scm (make-autoloads): Look for "emacs"
    executable independently on the label.
---
 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 e6b88ad..e48281d 100644
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@ -219,7 +219,7 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make 
TEST-COMMAND."
 
 (define* (make-autoloads #:key outputs inputs #:allow-other-keys)
   "Generate the autoloads file."
-  (let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs"))
+  (let* ((emacs (search-input-files inputs "/bin/emacs"))
          (out (assoc-ref outputs "out"))
          (elpa-name-ver (store-directory->elpa-name-version out))
          (elpa-name (package-name->name+version elpa-name-ver))



reply via email to

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