From 27d42f25f54b16f382e18b9ef0fb202fb00da90d Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Sat, 5 Jun 2021 11:02:16 +0200 Subject: [PATCH 1/8] qt-utils: Allow overriding the shell interpreter in 'wrap-qt-program'. * guix/build/qt-utils.scm (wrap-qt-program): Introduce a #:sh keyword argument and pass it to 'wrap-program'. --- guix/build/qt-utils.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index d2486ee86c..60e699fe39 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 David Craven +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,7 +21,7 @@ #:use-module (guix build utils) #:export (wrap-qt-program)) -(define (wrap-qt-program out program) +(define* (wrap-qt-program out program #:key (sh (which "bash"))) (define (suffix env-var path) (let ((env-val (getenv env-var))) (if env-val (string-append env-val ":" path) path))) @@ -34,6 +35,7 @@ (xdg-config-path (suffix "XDG_CONFIG_DIRS" (string-append out "/etc/xdg")))) (wrap-program (string-append out "/bin/" program) + #:sh sh `("QML2_IMPORT_PATH" = (,qml-path)) `("QT_PLUGIN_PATH" = (,plugin-path)) `("XDG_DATA_DIRS" = (,xdg-data-path)) -- 2.31.1