[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell int
From: |
Maxime Devos |
Subject: |
[bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used. |
Date: |
Thu, 30 Sep 2021 00:19:37 +0200 |
* 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.
---
guix/build/qt-utils.scm | 10 ++++++----
1 file 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))))))
--
2.33.0
- [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional., (continued)
- [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used.,
Maxime Devos <=
- [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests?., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs., Maxime Devos, 2021/09/29
- [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional., Maxime Devos, 2021/09/29