From a499d1772df63784e7df1767e58ca1dd5a4b1124 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 23 Mar 2024 00:31:25 -0400 Subject: 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 --- guix/build/qt-utils.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'guix') 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 ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021 Ludovic Courtès -;;; Copyright © 2021, 2022 Maxim Cournoyer -;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer +;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2021 Brendan Tildesley ;;; ;;; 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 -- cgit v1.2.3