mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: qt-utils: Use QML_IMPORT_PATH2 for Qt 5 (fixup).

Browse source 
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:
Zheng Junjie 2024-04-06 10:27:47 +08:00 committed by Maxim Cournoyer
parent 2ce05b362c
commit 91ad8a1444
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
guix/build/qt-utils.scm
View file

@ -5,6 +5,7 @@
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -89,7 +90,7 @@ (define exists? (match file-type
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
`("QT_PLUGIN_PATH" prefix directory `("QT_PLUGIN_PATH" prefix directory
,(format #f "/lib/qt~a/plugins" qt-major-version)) ,(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" "QML_IMPORT_PATH"
"QML2_IMPORT_PATH") "QML2_IMPORT_PATH")
prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version)) prefix directory ,(format #f "/lib/qt~a/qml" qt-major-version))