guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit f6afac071e1a71b72435c856e87b2bd34f27f1f9 Author: Nicolas Graves <[email protected]> AuthorDate: Mon Feb 23 07:14:30 2026 +0100 gnu: guile-2.0: Find bash unconditionally. * gnu/packages/guile.scm (guile-2.0)[arguments]<#:phases>: In phase 'pre-configure, find bash unconditionally. Change-Id: Ib6878dc5d258e89f49a87746285762662632a473 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/guile.scm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 5873c77c5b9..4f32646afe5 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -240,22 +240,9 @@ without requiring the source code to be rewritten.") (add-before 'configure 'pre-configure (lambda* (#:key inputs #:allow-other-keys) ;; Tell (ice-9 popen) the file name of Bash. - - ;; TODO: On the next rebuild cycle, unconditionally use - ;; 'search-input-file' instead of 'assoc-ref'. - (let ((bash (assoc-ref inputs "bash"))) - (substitute* "module/ice-9/popen.scm" - ;; If bash is #f allow fallback for user to provide - ;; "bash" in PATH. This happens when cross-building to - ;; MinGW for which we do not have Bash yet. - (("/bin/sh") - ,(cond ((target-mingw?) - "bash") - ((%current-target-system) - '(search-input-file inputs "/bin/bash")) - (else - '(string-append bash "/bin/bash"))))) - #t))) + (substitute* "module/ice-9/popen.scm" + (("/bin/sh") + (search-input-file inputs "/bin/bash"))))) (add-after 'install 'add-libxcrypt-reference-pkgconfig (lambda* (#:key inputs outputs #:allow-other-keys) (define out (assoc-ref outputs "out"))
