diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-13 13:45:35 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-13 13:45:35 -0400 |
| commit | c02257b6d1bade6efa528271b55bf8d8ab7b0296 (patch) | |
| tree | 616bad69b4bacba24c5105336bc282626fcbd114 /guix/build/qt-utils.scm | |
| parent | c371555a4b46a5c9288f54753b0f158f9c4b8abc (diff) | |
| parent | 0fe2c78cac19acfb46c3bc365075293e51e0e5aa (diff) | |
Merge staging branch.
Conflicts resolved in:
gnu/packages/engineering.scm
gnu/packages/gnuzilla.scm
gnu/packages/photo.scm
Diffstat (limited to 'guix/build/qt-utils.scm')
| -rw-r--r-- | guix/build/qt-utils.scm | 5 |
1 files 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)) |