janneke pushed a commit to branch core-packages-team
in repository guix.
commit 7aa0cc42b4faa3a61d4ae190af3f36b16a455c4e
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sat Mar 22 23:45:24 2025 +0100
gnu-bootstrap: Use ‘search-input-file’.
* guix/build/gnu-bootstrap.scm (bootstrap-configure)
(bootstrap-install): Use ‘search-input-file’ instead of ‘assoc-ref’.
Change-Id: I8cd876d099a346b55b5e06b3a220f712dd504791
---
guix/build/gnu-bootstrap.scm | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm
index b4257a3717..b265be7d1d 100644
--- a/guix/build/gnu-bootstrap.scm
+++ b/guix/build/gnu-bootstrap.scm
@@ -39,8 +39,7 @@ directory and configure all of the '.in' files with the
bootstrap
Guile and its module and object directories."
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (guile-dir (assoc-ref inputs "guile"))
- (guile (string-append guile-dir "/bin/guile"))
+ (guile (search-input-file inputs "/bin/guile"))
(moddir (string-append out "/share/guile/site/"
(effective-version)))
(godir (string-append out "/lib/guile/"
@@ -92,8 +91,7 @@ directories in MODULES, and all the executable files in the
SCRIPTS
directory."
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (guile-dir (assoc-ref inputs "guile"))
- (guile (string-append guile-dir "/bin/guile"))
+ (guile (search-input-file inputs "/bin/guile"))
(moddir (string-append out "/share/guile/site/"
(effective-version)))
(godir (string-append out "/lib/guile/"
