mbakke pushed a commit to branch staging
in repository guix.
commit 9d7a43d5d9f82666a21e5d850732bbbf6a5c1e64
Author: Jonathan Brielmaier <[email protected]>
AuthorDate: Sun May 10 15:49:20 2020 +0200
gnu: qtdeclarative: Fix reference on qmlcachegen.
* gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the
reference on qmlcachegen in an installed cmake file.
---
gnu/packages/qt.scm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 73d5383..0c3a680 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2020 Jakub Kądziołka <[email protected]>
;;; Copyright © 2020 Kei Kebreau <[email protected]>
;;; Copyright © 2020 TomZ <[email protected]>
+;;; Copyright © 2020 Jonathan Brielmaier <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -783,7 +784,18 @@ xmlpatternsvalidator.")))
"0l0nhc2si6dl9r4s1bs45z90qqigs8jnrsyjjdy38q4pvix63i53"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
- ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+ ((#:tests? _ #f) #f) ;TODO: Enable the tests
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'build 'fix-qt5core-install-prefix
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; The Qt5Core install prefix is set to qtbase, but
qmlcachegen
+ ;; is provided by qtdeclarative.
+ (substitute*
+ "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
+ (("\\$\\{_qt5Core_install_prefix\\}") out)))
+ #t))))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
