aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-06-03 19:09:12 +0300
committerEfraim Flashner <efraim@flashner.co.il>2018-06-03 19:11:27 +0300
commitd53e5b366d03ce29a16d96fbf91075a2de5bbd55 (patch)
treef35e9db9cd152678e54f6872ccc1ca1245583fe1
parent68ddfb2e8d43de248a64a9baf34ff7002053ede6 (diff)
downloadguix-d53e5b366d03ce29a16d96fbf91075a2de5bbd55.tar
guix-d53e5b366d03ce29a16d96fbf91075a2de5bbd55.tar.gz
gnu: gcompris-qt: Update to 0.91.
* gnu/packages/education.scm (gcompris-qt): Update to 0.91. [arguments]: Add custom phase to fix building with Qt 5.11.
-rw-r--r--gnu/packages/education.scm11
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 03050ffd0a..15b893c30d 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -115,7 +115,7 @@ of categories with some of the activities available in that category.
(define-public gcompris-qt
(package
(name "gcompris-qt")
- (version "0.90")
+ (version "0.91")
(source
(origin
(method url-fetch)
@@ -124,11 +124,18 @@ of categories with some of the activities available in that category.
version ".tar.xz"))
(sha256
(base32
- "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza"))))
+ "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg"))))
(build-system cmake-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-for-qt5.11
+ (lambda _
+ (substitute* "src/core/CMakeLists.txt"
+ (("qt5_use_modules") "target_link_libraries")
+ (("Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core")
+ "Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Multimedia Qt5::Core Qt5::Svg Qt5::Xml Qt5::XmlPatterns Qt5::Sensors"))
+ #t))
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))