From d087c9f89cb42878185a3041bde84ec95a8a996c Mon Sep 17 00:00:00 2001 Message-ID: From: Zheng Junjie Date: Sat, 6 Apr 2024 10:12:21 +0800 Subject: [PATCH] build: qt-utils: Use QML_IMPORT_PATH for Qt 6. This follow a499d1772df63784e7df1767e58ca1dd5a4b1124. * 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: I2dd1d426aef117105708cc4004078deaa28c15cd --- guix/build/qt-utils.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index 8962c0edb8..d7609b9f21 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2021 Brendan Tildesley +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,7 +90,7 @@ (define* (variables-for-wrapping base-directories output-directory '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") `("QT_PLUGIN_PATH" prefix directory ,(format #f "/lib/qt~a/plugins" qt-major-version)) - `(,(if (>= 6 (string->number 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)) base-commit: 6844a31733c9b5bf05196ba9742c325dbf3fe916 prerequisite-patch-id: 6183d199c58355eea1a85e1f1fe51f2f5fe44f65 prerequisite-patch-id: 01393e9870809c723a878e1ea7d3e15e3bfff267 prerequisite-patch-id: d93572d1797da3325ef119cac412c2dd6f12c136 -- 2.41.0