Subject: [bug#70096] Request for merging "qt-team" branch

From: Maxim Cournoyer <[email-masked]>
Date: Sat, 06 Apr 2024 11:46:15 -0400

Hi Zheng,

Zheng Junjie <[email-masked]> writes:

[...]

> 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 <[email-masked]>
>  ;;; Copyright © 2021, 2022, 2023, 2024 Maxim Cournoyer <[email-masked]>
>  ;;; Copyright © 2021 Brendan Tildesley <[email-masked]>
> +;;; Copyright © 2024 Zheng Junjie <[email-masked]>
>  ;;;
>  ;;; 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))

How embarrassing :-).  Thanks for the quick fix.  I'll apply it shortly.

-- 
Thanks,
Maxim