From c57975b0e7d27b8fac7791635a82e33244229af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 22 Mar 2025 23:09:41 +0100 Subject: [PATCH] =?UTF-8?q?build-system/gnu:=20Use=20=E2=80=98search-input?= =?UTF-8?q?-file=E2=80=99=20instead=20of=20input=20labels.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 c167d25286d3d38f14d2354b10737643f3769a8d..d92c08830d705f88ded20f2809050558dd56bf24 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 +;;; Copyright © 2012-2025 Ludovic Courtès ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov ;;; Copyright © 2014, 2015, 2017 Mark H Weaver @@ -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 0b94416a8d36473c09ef29170749f13420d6fb61..10542b3ec28d9ab904f76ddff2fd0826cc4abff5 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 +;;; Copyright © 2012-2021, 2025 Ludovic Courtès ;;; Copyright © 2018 Mark H Weaver ;;; Copyright © 2020 Brendan Tildesley ;;; Copyright © 2021, 2022 Maxim Cournoyer @@ -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")