diff options
| author | Maxime Devos <maximedevos@telenet.be> | 2021-10-01 16:21:39 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-10-02 11:00:06 +0000 |
| commit | 77b98bf1874aac8ed447e9f0b0ee0865a1d652ba (patch) | |
| tree | 99c085662ff2e5d1c7c8bf8175121b4f25b96518 /guix/build | |
| parent | a7bc1c8dd3613793c715765abc3d2604dfbdbed3 (diff) | |
build/qt-utils: Allow overriding the shell interpreter used.
* guix/build/qt-utils.scm
(wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'.
(wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead.
(wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead.
Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/qt-utils.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir)))))) |