diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-09 16:44:22 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-09 16:46:34 +0100 |
| commit | 6cae1db889f62051580d5a365f62585412a53a8c (patch) | |
| tree | 4d3db074d50ca3e2109cced17bec77f207a0c1fd /guix/build/qt-utils.scm | |
| parent | 410e699e0933653e69d03a4cdadf11854c6723f4 (diff) | |
| parent | 35e1d9247e39f3c91512cf3d9ef1467962389e35 (diff) | |
Merge remote-tracking branch 'savannah/master' into mesa-updates
Change-Id: Iad185e2ced97067b3dff8fd722435a6c5e2c00e5
Diffstat (limited to 'guix/build/qt-utils.scm')
| -rw-r--r-- | guix/build/qt-utils.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 7d1b0e0e23..d7609b9f21 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -3,9 +3,9 @@ ;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; 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, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -90,8 +90,10 @@ '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") `("QT_PLUGIN_PATH" prefix directory ,(format #f "/lib/qt~a/plugins" qt-major-version)) - `("QML2_IMPORT_PATH" prefix directory - ,(format #f "/lib/qt~a/qml" qt-major-version)) + `(,(if (>= (string->number qt-major-version) 6) + "QML_IMPORT_PATH" + "QML2_IMPORT_PATH") + prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version)) ;; QTWEBENGINEPROCESS_PATH accepts a single value, which makes 'exact the ;; most suitable environment variable type for it. `("QTWEBENGINEPROCESS_PATH" = regular |