From 20b5f14981a89688c8b1daed5e0f389ada6b2922 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 10 May 2020 15:49:20 +0200 Subject: 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(-) (limited to 'gnu/packages') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 73d538360d..0c3a680484 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Kei Kebreau ;;; Copyright © 2020 TomZ +;;; Copyright © 2020 Jonathan Brielmaier ;;; ;;; 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) -- cgit 1.4.1