futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/qt-utils: Allow overriding the shell interpreter used.

Browse Source 
* 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>
This commit is contained in:
Maxime Devos 2021-10-01 16:21:39 +02:00 committed by Mathieu Othacehe
parent a7bc1c8dd3
commit 77b98bf187
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/build/qt-utils.scm
View File

@ -90,7 +90,7 @@
'("QTWEBENGINEPROCESS_PATH" = regular '("QTWEBENGINEPROCESS_PATH" = regular
"/lib/qt5/libexec/QtWebEngineProcess")))) "/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) qt-wrap-excluded-inputs)
(define input-directories (define input-directories
@ -105,9 +105,9 @@
(cons output-dir input-directories) (cons output-dir input-directories)
output-dir))) output-dir)))
(when (not (null? vars-to-wrap)) (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-wrap-excluded-inputs %qt-wrap-excluded-inputs))
"Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\"
directory) with suitably set environment variables. 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 This is like qt-build-systems's phase \"qt-wrap\", but only the named program
is wrapped." is wrapped."
(wrap-qt-program* (string-append output "/bin/" program-name) (wrap-qt-program* (string-append output "/bin/" program-name)
#:sh sh
#:output-dir output #:inputs inputs #:output-dir output #:inputs inputs
#:qt-wrap-excluded-inputs qt-wrap-excluded-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-outputs '())
(qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)
#:allow-other-keys) #:allow-other-keys)
@ -144,6 +145,7 @@ add a dependency of that output on Qt."
((output . output-dir) ((output . output-dir)
(unless (member output qt-wrap-excluded-outputs) (unless (member output qt-wrap-excluded-outputs)
(for-each (cut wrap-qt-program* <> (for-each (cut wrap-qt-program* <>
#:sh sh
#:output-dir output-dir #:inputs inputs #:output-dir output-dir #:inputs inputs
#:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)
(find-files-to-wrap output-dir)))))) (find-files-to-wrap output-dir))))))