futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: qt-utils: Use QML_IMPORT_PATH for Qt 6.

Browse Source 
* 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
This commit is contained in:
Maxim Cournoyer 2024-03-23 00:31:25 -04:00
parent 0ca33051f3
commit a499d1772d
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
guix/build/qt-utils.scm
View File

@ -3,8 +3,7 @@
;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;;
;;; 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