diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index c9323ac8be..6fe5eba40b 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"))