[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/12: guix: qt-utils: Wrapped executables honor user's envvars.
From: |
guix-commits |
Subject: |
08/12: guix: qt-utils: Wrapped executables honor user's envvars. |
Date: |
Fri, 2 Jul 2021 16:52:52 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 30759c4aadf279e470e8d7f94de332a31c1b9f42
Author: Hartmut Goebel <h.goebel@crazy-compilers.com>
AuthorDate: Wed Aug 19 10:44:27 2020 +0200
guix: qt-utils: Wrapped executables honor user's envvars.
Prior to this change, wrappers did set the specified environment variables
to
a fixed value, overwriting any user settings. This inhibited propagating
e.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 variable
defines some config or data search path, e.g. XDG_DATA_DIRS). The code could
also 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(-)
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 3fbdb6b..0300595 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)
- branch master updated (b9aab8e -> d5c9cc6), guix-commits, 2021/07/02
- 01/12: gnu: qtbase: Enable GTK support., guix-commits, 2021/07/02
- 05/12: Revert "build-system/qt: Wrappers set 'QTWEBENGINEPROCESS_PATH' if needed.", guix-commits, 2021/07/02
- 02/12: gnu: qtbase: Specify configure flags via the #:configure-flags argument., guix-commits, 2021/07/02
- 03/12: gnu: protobuf: Update to 3.17.3., guix-commits, 2021/07/02
- 04/12: Revert "build-system/qt: Fix wrapping with QTWEBENGINEPROCESS_PATH.", guix-commits, 2021/07/02
- 07/12: guix: qt-build-system, qt-utils: Unify wrapping of qt-programs., guix-commits, 2021/07/02
- 06/12: Revert "build-system/qt: Wrappers only include relevant directories to XDG_DATA_DIRS.", guix-commits, 2021/07/02
- 11/12: build: qt-utils: Refactor the code to filter XDG_DATA_DIRS., guix-commits, 2021/07/02
- 10/12: guix: qt-utils: Don't include useless inputs in wrapped variables., guix-commits, 2021/07/02
- 08/12: guix: qt-utils: Wrapped executables honor user's envvars.,
guix-commits <=
- 09/12: build-system: qt: Exclude useless inputs from wrapped variables., guix-commits, 2021/07/02
- 12/12: build: qt-utils: Wrappers set 'QTWEBENGINEPROCESS_PATH' if needed., guix-commits, 2021/07/02