From d064cba7bfc051aa32816d5c64c466a52eaf6360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 1 Apr 2021 22:10:30 +0200
Subject: [PATCH] build-system/qt: Convert phases to a gexp if needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes a bug whereby the "/gnu/store/.*qmlcachegen" string in the
'ktouch' phases would incorrectly be interpreted as a store item,
leading to an error while trying to build it:

  $ ./pre-inst-env guix build ktouch -d --no-grafts
  guix build: error: path ‘/gnu/store/.*qmlcachegen’ is not valid

Reported by Christopher Baines.

* guix/build-system/qt.scm (qt-build)[builder]: If PHASES is a pair,
pass it to 'sexp->gexp'.
---
 guix/build-system/qt.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index 063fa7bedc..ccee89d5ef 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -142,7 +142,9 @@ (define builder
                     #:search-paths '#$(sexp->gexp
                                        (map search-path-specification->sexp
                                             search-paths))
-                    #:phases #$phases
+                    #:phases #$(if (pair? phases)
+                                   (sexp->gexp phases)
+                                   phases)
                     #:qt-wrap-excluded-outputs #$qt-wrap-excluded-outputs
                     #:configure-flags #$configure-flags
                     #:make-flags #$make-flags