tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: guile-2.0: Find bash unconditionally.

Browse Source 
* 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 <ludo@gnu.org>
This commit is contained in:
Nicolas Graves
2026-02-23 07:14:30 +01:00
committed by Ludovic Courtès
parent aeb969a803
commit 41b969692d
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/guile.scm
View File

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