diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-03-23 00:31:25 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2024-04-03 18:05:10 -0400 |
| commit | a499d1772df63784e7df1767e58ca1dd5a4b1124 (patch) | |
| tree | e6ac8c3c00ce487a900b28076af68dcace733a48 | |
| parent | 0ca33051f3bec92d9a363b00a0209c99be2826f4 (diff) | |
| download | guix-a499d1772df63784e7df1767e58ca1dd5a4b1124.tar.gz guix-a499d1772df63784e7df1767e58ca1dd5a4b1124.zip | |
build: qt-utils: Use QML_IMPORT_PATH for Qt 6.
* guix/build/qt-utils.scm (variables-for-wrapping): Use QML_IMPORT_PATH
instead of QML2_IMPORT_PATH when the major version is greater or equal to 6.
Change-Id: I3480b540d3c0caafd3cc3d6574442dc97f540953
| -rw-r--r-- | guix/build/qt-utils.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 7d1b0e0e23..8962c0edb8 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -3,8 +3,7 @@ ;;; 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> ;;; ;;; This file is part of GNU Guix. @@ -90,8 +89,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 (>= 6 (string->number qt-major-version)) + "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 |