diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-06-04 11:25:48 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-06-04 11:25:48 +0200 |
| commit | 32da38d5721663a470b335f86b67cffdc4f34f0a (patch) | |
| tree | b633522943117bf3552195ef77ae74470b706ce0 /gnu/packages/education.scm | |
| parent | 0c0431f9ce32a64ca663a2c5fc6656cbb86dc245 (diff) | |
| parent | c0e7a52996edf75a403ef6c454072271fd1c277a (diff) | |
| download | patches-32da38d5721663a470b335f86b67cffdc4f34f0a.tar patches-32da38d5721663a470b335f86b67cffdc4f34f0a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 11 |
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"))) |