diff options
Diffstat (limited to 'guix/build/qt-utils.scm')
| -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 7f503320d2..f52e3f7af5 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -97,7 +97,7 @@ `("QTWEBENGINEPROCESS_PATH" = regular ,(format #f "/lib/qt~a/libexec/QtWebEngineProcess" qt-major-version))))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs (qt-major-version %default-qt-major-version)) @@ -114,9 +114,9 @@ output-dir #:qt-major-version qt-major-version))) (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) (qt-major-version %default-qt-major-version)) "Wrap the specified program (which must reside in the OUTPUT's \"/bin\" @@ -125,11 +125,12 @@ 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 #:qt-major-version qt-major-version)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs qtbase (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) @@ -168,6 +169,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 #:qt-major-version qt-major-version) |