janneke pushed a commit to branch core-packages-team
in repository guix.
commit b052850de530b9be87dc581f1f471c5bcc772389
Author: Ludovic Courtès <[email protected]>
AuthorDate: Sat Mar 22 23:09:41 2025 +0100
build-system/gnu: Use ‘search-input-file’ instead of input labels.
* guix/build/gnu-build-system.scm (configure): Use ‘search-input-file’
instead of ‘assoc-ref’ when looking for bash.
* gnu/packages/commencement.scm (%boot-gash-inputs): Update comment.
Change-Id: Ie95e95cfeb9f004fd304ff2af471ea5840af2b2e
---
gnu/packages/commencement.scm | 4 ++--
guix/build/gnu-build-system.scm | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 485b1fcd1a..f67c773a8a 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2024 Ludovic Courtès <[email protected]>
+;;; Copyright © 2012-2025 Ludovic Courtès <[email protected]>
;;; Copyright © 2014 Andreas Enge <[email protected]>
;;; Copyright © 2012 Nikita Karetnikov <[email protected]>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <[email protected]>
@@ -317,7 +317,7 @@ pure Scheme to Tar and decompression in one easy step.")
(native-inputs `(("bootar" ,bootar)))))
(define (%boot-gash-inputs)
- `(("bash" , gash-boot) ; gnu-build-system wants "bash"
+ `(("bash" , gash-boot) ;gnu-build-system used to expect "bash"
("coreutils" , gash-utils-boot)
("bootar" ,bootar)
("guile" ,%bootstrap-guile)))
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 0b94416a8d..10542b3ec2 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021
Ludovic Courtès <[email protected]>
+;;; Copyright © 2012-2021, 2025 Ludovic Courtès <[email protected]>
;;; Copyright © 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2020 Brendan Tildesley <[email protected]>
;;; Copyright © 2021, 2022 Maxim Cournoyer <[email protected]>
@@ -317,8 +317,9 @@ makefiles."
(libdir (assoc-ref outputs "lib"))
(includedir (assoc-ref outputs "include"))
(docdir (assoc-ref outputs "doc"))
- (bash (or (and=> (assoc-ref (or native-inputs inputs) "bash")
- (cut string-append <> "/bin/bash"))
+ (bash (or (false-if-exception
+ (search-input-file (or native-inputs inputs)
+ "/bin/bash"))
"/bin/sh"))
(flags `(,@(if target ; cross building
'("CC_FOR_BUILD=gcc")
