From: Jonathan Brielmaier <jonathan.brielmaier@web.de>
To: 40777@debbugs.gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Subject: [bug#40777] [PATCH 1/3] gnu: qtdeclarative: Fix reference on qmlcachegen.
Date: Wed, 22 Apr 2020 21:54:09 +0200 [thread overview]
Message-ID: <20200422195411.9961-1-jonathan.brielmaier@web.de> (raw)
In-Reply-To: <20200422175643.7263-1-jonathan.brielmaier@web.de>
* gnu/packages/qt.scm (qtdeclarative)[arguments]: Add phase to fix the
reference on qmlcachegen in an installed cmake file.
---
gnu/packages/qt.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 6ca052c31a..f540da458e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2018 John Soo <jsoo1@asu.edu>
;;; Copyright © 2020 Mike Rosset <mike.rosset@gmail.com>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -778,7 +779,17 @@ xmlpatternsvalidator.")))
"1gg9xbv8ah4p55ws97brwn0csl0k3j1x6zdknrrsnh7j6nh0bp2w"))))
(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
+ ;; The qt5core install prefix is set to qtbase, but qmlcachegen is
+ ;; provided by qtdeclarative
+ (add-after 'build 'fix-qt5core-install-prefix
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
+ (("\\$\\{_qt5Core_install_prefix\\}") out )))
+ #t))))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)
--
2.26.0
next prev parent reply other threads:[~2020-04-22 19:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 17:56 [bug#40777] [PATCH 0/3] [staging] Update nheko Jonathan Brielmaier
2020-04-22 19:54 ` Jonathan Brielmaier [this message]
2020-04-22 19:54 ` [bug#40777] [PATCH 2/3] gnu: mtxclient: Update to 0.3.0 Jonathan Brielmaier
2020-04-22 19:54 ` [bug#40777] [PATCH 3/3] gnu: nheko: Update to 0.7.0 Jonathan Brielmaier
2020-05-10 13:49 ` [bug#40777] [v2 PATCH 0/3] [staging] Update nheko Jonathan Brielmaier
2020-05-10 13:49 ` [bug#40777] [PATCH 1/3] gnu: qtdeclarative: Fix reference on qmlcachegen Jonathan Brielmaier
2020-05-10 13:49 ` [bug#40777] [PATCH 2/3] gnu: mtxclient: Update to 0.3.0 Jonathan Brielmaier
2020-05-10 13:49 ` [bug#40777] [PATCH 3/3] gnu: nheko: Update to 0.7.1 Jonathan Brielmaier
2020-05-22 22:10 ` bug#40777: [v2 PATCH 0/3] [staging] Update nheko Marius Bakke
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422195411.9961-1-jonathan.brielmaier@web.de \
--to=jonathan.brielmaier@web.de \
--cc=40777@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).