ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 14:28:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system/qt: Convert phases to a gexp if needed.

Browse source 
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'.
This commit is contained in:
Ludovic Courtès 2021-04-01 22:10:30 +02:00
parent 600effef2b
commit d064cba7bf
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
guix/build-system/qt.scm
View file

@ -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