mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
build: qt-utils: Use QML_IMPORT_PATH2 for Qt 5 (fixup).
This follows a499d1772d
("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>
This commit is contained in:
parent
2ce05b362c
commit
91ad8a1444
1 changed files with 2 additions and 1 deletions
|
@ -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 @@ (define exists? (match file-type
|
|||
'("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))
|
||||
|
|
Loading…
Reference in a new issue