[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
227/416: build: qt-utils: Revert setting QT_PLUGIN_PATH exactly.
From: |
guix-commits |
Subject: |
227/416: build: qt-utils: Revert setting QT_PLUGIN_PATH exactly. |
Date: |
Fri, 14 Apr 2023 15:25:57 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit cc3dc58f2b84dd2d15ff67edef22ddd5a9e82580
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))
- 335/416: gnu: rust-futures-0.3: Update to 0.3.26., (continued)
- 335/416: gnu: rust-futures-0.3: Update to 0.3.26., guix-commits, 2023/04/14
- 336/416: gnu: rust-futures-channel-0.3: Update to 0.3.26., guix-commits, 2023/04/14
- 338/416: gnu: rust-futures-executor-0.3: Update to 0.3.26., guix-commits, 2023/04/14
- 342/416: gnu: rust-futures-test-0.3: Update to 0.3.26., guix-commits, 2023/04/14
- 352/416: gnu: python-pint: Use python-pytest-7.1., guix-commits, 2023/04/14
- 354/416: gnu: python-cryptography: Update to 40.0.1 [fixes CVE-2023-23931]., guix-commits, 2023/04/14
- 287/416: gnu: blender: Update to 3.3.5., guix-commits, 2023/04/14
- 195/416: gnu: rust-cargo-platform-0.1: Update to 0.1.2., guix-commits, 2023/04/14
- 210/416: gnu: gstreamer: Update to 1.22.1., guix-commits, 2023/04/14
- 211/416: gnu: gstreamer-docs: Update to 1.22.1., guix-commits, 2023/04/14
- 227/416: build: qt-utils: Revert setting QT_PLUGIN_PATH exactly.,
guix-commits <=
- 232/416: gnu: qtx11extras: Update to 5.15.8., guix-commits, 2023/04/14
- 242/416: gnu: qtwebchannel-5: Update to 5.15.8., guix-commits, 2023/04/14
- 244/416: gnu: qtwebview: Update to 5.15.8., guix-commits, 2023/04/14
- 246/416: gnu: qttools-5: Update to 5.15.8., guix-commits, 2023/04/14
- 252/416: gnu: qtscxml: Update to 5.15.8., guix-commits, 2023/04/14
- 270/416: gnu: hdf5@1.10: Update to 1.10.9., guix-commits, 2023/04/14
- 273/416: gnu: hdf5-1.8: Delete trailing #t., guix-commits, 2023/04/14
- 276/416: gnu: ucd: Update to 15.0.0., guix-commits, 2023/04/14
- 353/416: gnu: python-celery: Use python-pytest-7.1., guix-commits, 2023/04/14
- 347/416: gnu: rust-pem-1: Update to 1.1.1., guix-commits, 2023/04/14