build: qt-utils: Revert setting QT_PLUGIN_PATH exactly.
Fixes <https://issues.guix.gnu.org/57742>.
The documentation of Qt states that it is a supported use case to mix Qt 5 and
Qt 6 plugins in QT_PLUGIN_PATH [0]. This reverts the change to QT_PLUGIN_PATH
introduced in 1f466ed6be
("build: qt: Add qtbase argument and wrap Qt
environment variables exactly.").
[0] https://doc.qt.io/qt-6.2/deployment-plugins.html#loading-and-verifying-plugins-dynamically
* guix/build/qt-utils.scm (variables-for-wrapping): Wrap QT_PLUGIN_PATH using
the prefix method.
master
parent
18e1325119
commit
cc3dc58f2b
|
@ -4,6 +4,7 @@
|
||||||
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
||||||
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
|
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||||
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
|
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
|
@ -87,9 +88,7 @@
|
||||||
"/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
|
"/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
|
||||||
"/mime" "/sounds" "/themes" "/wallpapers")
|
"/mime" "/sounds" "/themes" "/wallpapers")
|
||||||
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
|
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
|
||||||
;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which
|
`("QT_PLUGIN_PATH" prefix directory
|
||||||
;; would cause warnings, perhaps problems.
|
|
||||||
`("QT_PLUGIN_PATH" = directory
|
|
||||||
,(format #f "/lib/qt~a/plugins" qt-major-version))
|
,(format #f "/lib/qt~a/plugins" qt-major-version))
|
||||||
`("QML2_IMPORT_PATH" = directory
|
`("QML2_IMPORT_PATH" = directory
|
||||||
,(format #f "/lib/qt~a/qml" qt-major-version))
|
,(format #f "/lib/qt~a/qml" qt-major-version))
|
||||||
|
|
Reference in New Issue