nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gcompris-qt: Update to 0.90. 

* gnu/packages/education.scm (gcompris-qt): Update to 0.90.
[source, home-page]: Use https.
[arguments]: Add 'wrap-executable phase to declare the QT_PLUGIN_PATH
and QML2_IMPORT_PATH without needing propagated inputs.
[native-inputs]: Add qttools.
[inputs]: Remove qt, add qtbase, qtdeclarative, qtgraphicaleffects,
qtmultimedia, qtquickcontrols, qtsensors, qtsvg, qtxmlpatterns.
This commit is contained in:
Efraim Flashner 2018-04-22 15:56:42 +03:00
parent f347c24acc
commit 5c1052039e
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gnu/packages/education.scm
View File

@ -2,7 +2,7 @@
;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -107,29 +107,54 @@ of categories with some of the activities available in that category.
(define-public gcompris-qt (define-public gcompris-qt
(package (package
(name "gcompris-qt") (name "gcompris-qt")
(version "0.70") (version "0.90")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"http://gcompris.net/download/qt/src/gcompris-qt-" "https://gcompris.net/download/qt/src/gcompris-qt-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"01r7i8dmwb2nlfyp0y0mzs8yydmvn5gq7xn1w7g21lysak1mliwa")))) "1i5adxnhig849qxwi3c4v7r84q6agx1zxkd69fh4y7lcmq2qiaza"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
;; Qml_box2d is unmaintained and not actually required for building `(#:phases
'(#:configure-flags (list "-DQML_BOX2D_MODULE=disabled") (modify-phases %standard-phases
(add-after 'install 'wrap-executable
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/gcompris-qt")
`("QT_PLUGIN_PATH" ":" prefix
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/plugins"))
'("qtbase" "qtdeclarative" "qtmultimedia" "qtsvg")))
`("QML2_IMPORT_PATH" ":" prefix
,(map (lambda (label)
(string-append (assoc-ref inputs label)
"/lib/qt5/qml"))
'("qtdeclarative" "qtgraphicaleffects"
"qtmultimedia" "qtquickcontrols"))))
#t))))
#:configure-flags (list "-DQML_BOX2D_MODULE=disabled")
#:tests? #f)) ; no test target #:tests? #f)) ; no test target
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("gettext" ,gettext-minimal) ("gettext" ,gettext-minimal)
("perl" ,perl))) ("perl" ,perl)
("qttools" ,qttools)))
(inputs (inputs
`(("python-2" ,python-2) `(("python-2" ,python-2)
("qt" ,qt))) ; Cannot find qtquick at runtime with modular qt. ("qtbase" ,qtbase)
(home-page "http://gcompris.net/index-en.html") ("qtdeclarative" ,qtdeclarative)
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtmultimedia" ,qtmultimedia)
("qtquickcontrols" ,qtquickcontrols)
("qtsensors" ,qtsensors)
("qtsvg" ,qtsvg)
("qtxmlpatterns" ,qtxmlpatterns)))
(home-page "https://gcompris.net/index-en.html")
(synopsis "Educational games for small children") (synopsis "Educational games for small children")
(description (description
"Gcompris offers a large collection of educational games for small "Gcompris offers a large collection of educational games for small