19/51: build: qt-utils: Revert setting QT_PLUGIN_PATH exactly.

[guix-commits]

apteryx pushed a commit to branch staging
in repository guix.

commit e4ef2db8fda85a469a6fc89bf3c46c9d7e8d44ea
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Mar 27 15:07:03 2023 -0400

    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 1f466ed6be9 ("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.
---
 guix/build/qt-utils.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm
index 2e47f1bc02..7f503320d2 100644
--- a/guix/build/qt-utils.scm
+++ b/guix/build/qt-utils.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; 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>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -87,9 +88,7 @@
       "/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
       "/mime" "/sounds" "/themes" "/wallpapers")
     '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
-    ;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which
-    ;; would cause warnings, perhaps problems.
-    `("QT_PLUGIN_PATH" = directory
+    `("QT_PLUGIN_PATH" prefix directory
       ,(format #f "/lib/qt~a/plugins" qt-major-version))
     `("QML2_IMPORT_PATH" = directory
       ,(format #f "/lib/qt~a/qml" qt-major-version))