[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
57/63: gnu: qtdeclarative: Fix reference on qmlcachegen.
From: |
guix-commits |
Subject: |
57/63: gnu: qtdeclarative: Fix reference on qmlcachegen. |
Date: |
Tue, 26 May 2020 17:18:15 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 20b5f14981a89688c8b1daed5e0f389ada6b2922
Author: Jonathan Brielmaier <address@hidden>
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 <address@hidden>
;;; Copyright © 2020 Kei Kebreau <address@hidden>
;;; Copyright © 2020 TomZ <address@hidden>
+;;; Copyright © 2020 Jonathan Brielmaier <address@hidden>
;;;
;;; 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)
- 34/63: gnu: Mesa: Fix ineffective substitution on i686-linux., (continued)
- 34/63: gnu: Mesa: Fix ineffective substitution on i686-linux., guix-commits, 2020/05/26
- 42/63: gnu: glslang: Update to 8.13.3743., guix-commits, 2020/05/26
- 44/63: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/26
- 48/63: gnu: shaderc: Update to 2020.0., guix-commits, 2020/05/26
- 53/63: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/26
- 55/63: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/26
- 58/63: gnu: mtxclient: Update to 0.3.0., guix-commits, 2020/05/26
- 46/63: gnu: vulkan-loader: Enable tests., guix-commits, 2020/05/26
- 45/63: gnu: vulkan-loader: Update to 1.2.140., guix-commits, 2020/05/26
- 50/63: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/26
- 57/63: gnu: qtdeclarative: Fix reference on qmlcachegen.,
guix-commits <=
- 61/63: gnu: mesa-headers: Do not inherit outputs from Mesa., guix-commits, 2020/05/26
- 63/63: Merge branch 'master' into staging, guix-commits, 2020/05/26