2 files changed, 6 insertions(+), 5 deletions(-)

M gnu/packages/commencement.scm
M guix/build/gnu-build-system.scm

@@ 1,5 1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012-2024 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012-2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>


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

@@ 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 <ludo@gnu.org>
+;;; Copyright © 2012-2021, 2025 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2020 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>


@@ 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")