mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-13 22:50:23 -05:00
gnu: gcompris-qt: Update to 1.0.
* gnu/packages/education.scm (gcompris-qt): Update to 1.0. [arguments]: Drop custom 'disable-failing-test phase. Set HOME to help test suite run. [inputs]: Replace python-2 with python-wrapper.
This commit is contained in:
parent
6629aa2a83
commit
6ace1ec816
1 changed files with 5 additions and 8 deletions
|
@ -140,7 +140,7 @@ (define-public gcompris
|
||||||
(define-public gcompris-qt
|
(define-public gcompris-qt
|
||||||
(package
|
(package
|
||||||
(name "gcompris-qt")
|
(name "gcompris-qt")
|
||||||
(version "0.98")
|
(version "1.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -148,22 +148,19 @@ (define-public gcompris-qt
|
||||||
"https://gcompris.net/download/qt/src/gcompris-qt-"
|
"https://gcompris.net/download/qt/src/gcompris-qt-"
|
||||||
version ".tar.xz"))
|
version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y"))))
|
(base32 "08dw1q0h4qz2q0ksa5pbmb9v60hr1zv9skx6z8dlq9b1i7harnds"))))
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'disable-failing-test
|
|
||||||
(lambda _
|
|
||||||
(substitute* "tests/core/CMakeLists.txt"
|
|
||||||
(("DownloadManagerTest\\.cpp") "#"))
|
|
||||||
#t))
|
|
||||||
(add-before 'check 'start-xorg-server
|
(add-before 'check 'start-xorg-server
|
||||||
(lambda* (#:key inputs #:allow-other-keys)
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
;; The test suite requires a running X server.
|
;; The test suite requires a running X server.
|
||||||
(system (string-append (assoc-ref inputs "xorg-server")
|
(system (string-append (assoc-ref inputs "xorg-server")
|
||||||
"/bin/Xvfb :1 &"))
|
"/bin/Xvfb :1 &"))
|
||||||
(setenv "DISPLAY" ":1")
|
(setenv "DISPLAY" ":1")
|
||||||
|
;; The test suite wants to write to /homeless-shelter
|
||||||
|
(setenv "HOME" (getcwd))
|
||||||
#t))
|
#t))
|
||||||
(add-after 'install 'wrap-executable
|
(add-after 'install 'wrap-executable
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
|
@ -192,7 +189,7 @@ (define-public gcompris-qt
|
||||||
("xorg-server" ,xorg-server-for-tests)))
|
("xorg-server" ,xorg-server-for-tests)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("openssl" ,openssl)
|
`(("openssl" ,openssl)
|
||||||
("python-2" ,python-2)
|
("python" ,python-wrapper)
|
||||||
("qtbase" ,qtbase)
|
("qtbase" ,qtbase)
|
||||||
("qtdeclarative" ,qtdeclarative)
|
("qtdeclarative" ,qtdeclarative)
|
||||||
("qtgraphicaleffects" ,qtgraphicaleffects)
|
("qtgraphicaleffects" ,qtgraphicaleffects)
|
||||||
|
|
Loading…
Reference in a new issue