~ruther/guix-local

91ad8a1444fa1b1d002e26bbed580e869723af47 — Zheng Junjie 1 year, 11 months ago 2ce05b3 
build: qt-utils: Use QML_IMPORT_PATH2 for Qt 5 (fixup).

This follows a499d1772df63784e7df1767e58ca1dd5a4b1124 ("build: qt-utils: Use
QML_IMPORT_PATH for Qt 6.").

* guix/build/qt-utils.scm (variables-for-wrapping): Use QML_IMPORT_PATH2 when
the Qt major version is <= 6, QML_IMPORT_PATH otherwise.

Change-Id: I2dd1d426aef117105708cc4004078deaa28c15cd
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
patch browse .tar.gz 
1 files changed, 2 insertions(+), 1 deletions(-)

M guix/build/qt-utils.scm

M guix/build/qt-utils.scm => guix/build/qt-utils.scm +2 -1
@@ 5,6 5,7 @@
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; 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.
;;;


@@ 89,7 90,7 @@
    '("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))