diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-03-22 23:09:41 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:31 +0200 |
| commit | c57975b0e7d27b8fac7791635a82e33244229af9 (patch) | |
| tree | 9495a0a4d82b74c9a5804aa6e4f9e9969b727d3b | |
| parent | df94888eca214c496b5cdf57795e03b96866c3af (diff) | |
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
| -rw-r--r-- | gnu/packages/commencement.scm | 4 | ||||
| -rw-r--r-- | 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 c167d25286..d92c08830d 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 <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))) 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 <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") |