[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
37/38: build/qt-utils: Allow overriding the shell interpreter used.
From: |
guix-commits |
Subject: |
37/38: build/qt-utils: Allow overriding the shell interpreter used. |
Date: |
Sat, 2 Oct 2021 12:52:47 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 77b98bf1874aac8ed447e9f0b0ee0865a1d652ba
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Oct 1 16:21:39 2021 +0200
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>
---
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 c2b80ca..97145a1 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))))))
- 30/38: gnu: wayland: Unconditionally lookup docbook in native-inputs., (continued)
- 30/38: gnu: wayland: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 18/38: gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 22/38: gnu: gdk-pixbuf: Remove trailing #t., guix-commits, 2021/10/02
- 25/38: gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 12/38: gnu: gobject-introspection: Move things to native-inputs., guix-commits, 2021/10/02
- 19/38: gnu: gdk-pixbuf: Respect #:tests?., guix-commits, 2021/10/02
- 24/38: gnu: at-spi2-core: Respect #:tests?., guix-commits, 2021/10/02
- 32/38: gnu: json-glib: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 34/38: gnu: heimdal: Make 'bash-minimal' input unconditional., guix-commits, 2021/10/02
- 38/38: lint: check-wrapper-inputs: Remove mentions of core-updates., guix-commits, 2021/10/02
- 37/38: build/qt-utils: Allow overriding the shell interpreter used.,
guix-commits <=
- 31/38: gnu: json-glib: Unconditionally lookup docbook in native-inputs., guix-commits, 2021/10/02
- 33/38: gnu: heimdal: Make some parts of phases unconditional., guix-commits, 2021/10/02
- 35/38: gnu: libcap: Unconditionally use #$output., guix-commits, 2021/10/02
- 36/38: gnu: libproxy: Respect #:tests?., guix-commits, 2021/10/02