diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-05-31 19:20:12 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-06-04 22:34:32 +0200 |
| commit | 2ac898d7f84a5ee9dee841ff3957455cb28b0b2b (patch) | |
| tree | e6c6dc76f94ae921c7718cd83151dba071fc79a2 | |
| parent | 5b24cbee312586aedbd48fbe13ee14191801f099 (diff) | |
| download | guix-2ac898d7f84a5ee9dee841ff3957455cb28b0b2b.tar guix-2ac898d7f84a5ee9dee841ff3957455cb28b0b2b.tar.gz | |
qt-build-system: Look up the interpreter in 'inputs'.
* guix/build/qt-build-system.scm (wrap-all-programs): Pass
the shell interpreter from 'inputs' to 'wrap-program' using
'search-input-file'.
Partially-Fixes: <https://issues.guix.gnu.org/47869>
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | guix/build/qt-build-system.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index 762fd8a2ee..ec7ceb38bd 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014, 2015, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> +;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,6 +127,12 @@ add a dependency of that output on Qt." (((_ . dir) ...) dir))) + ;; Do not require bash to be present in the package inputs + ;; even when there is nothing to wrap. + ;; Also, calculate (sh) only once to prevent some I/O. + (define %sh (delay (search-input-file inputs "bin/bash"))) + (define (sh) (force %sh)) + (define handle-output (match-lambda ((output . directory) @@ -135,7 +142,7 @@ add a dependency of that output on Qt." (append (list directory) input-directories)))) (when (not (null? vars-to-wrap)) - (for-each (cut apply wrap-program <> vars-to-wrap) + (for-each (cut apply wrap-program <> #:sh (sh) vars-to-wrap) bin-list))))))) (for-each handle-output outputs) |