[PATCH 2/4] guix: qt-utils: Wrapped executables honor user's envvars.

DoneSubmitted by Hartmut Goebel.
Details
2 participants
  • Hartmut Goebel
  • Hartmut Goebel
Owner
unassigned
Severity
normal
Merged with
H
H
Hartmut Goebel wrote on 11 Jan 15:41 +0100
ceef8786cf0bf12fcec3fcce066d7f82f4bb746d.1610376081.git.h.goebel@crazy-compilers.com
Prior to this change, wrappers did set the specified environment variables toa fixed value, overwriting any user settings. This inhibited propagatinge.g. XDG_DATA_DIRS from a profile to the application.
Now user environment variables are prefixed (if the variable defines some"binary" search path, e.g. QT_PLUGIN_PATH) or suffixed (if the variabledefines some config or data search path, e.g. XDG_DATA_DIRS). The code couldalso allow to overwrite, anyhow currently no variable is defined like this.
* guix/build/qt-utils.scm (variables-for-wrapping): For each env-var to be wrapped, specify whether it should prefix, suffix or overwrite the user's variable.--- guix/build/qt-utils.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
Toggle diff (27 lines)diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scmindex 3fbdb6be61..030059522d 100644--- a/guix/build/qt-utils.scm+++ b/guix/build/qt-utils.scm@@ -39,14 +39,15 @@ (lambda (var-to-wrap) (not (null? (last var-to-wrap)))) (map (lambda (var-spec)- `(,(first var-spec) = ,(collect-sub-dirs base-directories (last var-spec))))+ (list (first var-spec) (second var-spec)+ (collect-sub-dirs base-directories (third var-spec)))) (list ;; these shall match the search-path-specification for Qt and KDE ;; libraries- '("XDG_DATA_DIRS" "/share")- '("XDG_CONFIG_DIRS" "/etc/xdg")- '("QT_PLUGIN_PATH" "/lib/qt5/plugins")- '("QML2_IMPORT_PATH" "/lib/qt5/qml")))))+ '("XDG_DATA_DIRS" suffix "/share")+ '("XDG_CONFIG_DIRS" suffix "/etc/xdg")+ '("QT_PLUGIN_PATH" prefix "/lib/qt5/plugins")+ '("QML2_IMPORT_PATH" prefix "/lib/qt5/qml"))))) (define* (wrap-qt-program* program #:key inputs output-dir)-- 2.21.3
H
H
Hartmut Goebel wrote on 11 Jan 16:46 +0100
(no subject)
(name . debbugs control)(address . control@debbugs.gnu.org)
ac7e562e-076e-57c7-d0b0-a4e3976f688f@goebel-consult.de
merge 45785 45784 45786 45787
?