summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-12-24 22:17:17 +0200
committerEfraim Flashner <efraim@flashner.co.il>2018-12-24 22:19:39 +0200
commit3619b26196f92bd9dbf265ddea65cc3884b92965 (patch)
treef2449eb2b984bf2dde9ba75d2ead76b2e9d30be8
parent78bc4eb627c6063df441ce651c666cc64096c2a7 (diff)
gnu: gcompris-qt: Update to 0.95.
* gnu/packages/education.scm (gcompris-qt): Update to 0.95. [arguments]: Remove custom phase to patch for qt@5.11.
-rw-r--r--gnu/packages/education.scm11
1 files changed, 2 insertions, 9 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 567dfce58d2..3487db436be 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.
115(define-public gcompris-qt 115(define-public gcompris-qt
116 (package 116 (package
117 (name "gcompris-qt") 117 (name "gcompris-qt")
118 (version "0.91") 118 (version "0.95")
119 (source 119 (source
120 (origin 120 (origin
121 (method url-fetch) 121 (method url-fetch)
@@ -124,18 +124,11 @@ of categories with some of the activities available in that category.
124 version ".tar.xz")) 124 version ".tar.xz"))
125 (sha256 125 (sha256
126 (base32 126 (base32
127 "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg")))) 127 "1aaijjx2b7k1cyx59jhs64hlp1sppw1faa81qxl5lxc79vifrlrl"))))
128 (build-system cmake-build-system) 128 (build-system cmake-build-system)
129 (arguments 129 (arguments
130 `(#:phases 130 `(#:phases
131 (modify-phases %standard-phases 131 (modify-phases %standard-phases
132 (add-after 'unpack 'patch-for-qt5.11
133 (lambda _
134 (substitute* "src/core/CMakeLists.txt"
135 (("qt5_use_modules") "target_link_libraries")
136 (("Qml Quick Gui Multimedia Network XmlPatterns Svg Xml Sensors Core")
137 "Qt5::Qml Qt5::Quick Qt5::Gui Qt5::Multimedia Qt5::Core Qt5::Svg Qt5::Xml Qt5::XmlPatterns Qt5::Sensors"))
138 #t))
139 (add-after 'install 'wrap-executable 132 (add-after 'install 'wrap-executable
140 (lambda* (#:key inputs outputs #:allow-other-keys) 133 (lambda* (#:key inputs outputs #:allow-other-keys)
141 (let ((out (assoc-ref outputs "out"))) 134 (let ((out (assoc-ref outputs "out")))