diff options
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index b333bb9d35..ef97d58a84 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages texinfo) + #:use-module (gnu packages xorg) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) @@ -115,7 +116,7 @@ of categories with some of the activities available in that category. (define-public gcompris-qt (package (name "gcompris-qt") - (version "0.91") + (version "0.95") (source (origin (method url-fetch) @@ -124,17 +125,17 @@ of categories with some of the activities available in that category. version ".tar.xz")) (sha256 (base32 - "09h098w9q79hnzla1pcpqlnnr6dbafm4q6zmdp7wlk11ym8n9kvg")))) + "1aaijjx2b7k1cyx59jhs64hlp1sppw1faa81qxl5lxc79vifrlrl")))) (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")) + (add-before 'check 'start-xorg-server + (lambda* (#:key inputs #:allow-other-keys) + ;; The test suite requires a running X server. + (system (string-append (assoc-ref inputs "xorg-server") + "/bin/Xvfb :1 &")) + (setenv "DISPLAY" ":1") #t)) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) @@ -152,13 +153,14 @@ of categories with some of the activities available in that category. '("qtdeclarative" "qtgraphicaleffects" "qtmultimedia" "qtquickcontrols")))) #t)))) - #:configure-flags (list "-DQML_BOX2D_MODULE=disabled") - #:tests? #f)) ; no test target + #:configure-flags (list "-DQML_BOX2D_MODULE=disabled" + "-DBUILD_TESTING=TRUE"))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("gettext" ,gettext-minimal) ("perl" ,perl) - ("qttools" ,qttools))) + ("qttools" ,qttools) + ("xorg-server" ,xorg-server))) (inputs `(("python-2" ,python-2) ("qtbase" ,qtbase) @@ -243,7 +245,7 @@ easy.") (define-public snap (package (name "snap") - (version "4.2.2.2") + (version "4.2.2.9") (source (origin (method git-fetch) @@ -253,7 +255,7 @@ easy.") (file-name (git-file-name name version)) (sha256 (base32 - "0bay08yr58qj8wzpjg33gdj78rfhyskfzidknpdl3cr1jrj6i4p9")))) + "07qyhh4f8gr1fqyvxa2i6lkzaaa0vl12yzllgp81rdil8z8bi976")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) |