diff options
Diffstat (limited to 'gnu/packages/education.scm')
-rw-r--r-- | gnu/packages/education.scm | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4f4de1a834..716f15a9db 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -101,10 +101,9 @@ (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl-mixer") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t))))) + (string-append + (search-input-directory inputs "include/SDL") + ":" (or (getenv "CPATH") "")))))))) (inputs `(("gtk+" ,gtk+-2) ("librsvg" ,librsvg) @@ -157,8 +156,7 @@ of categories with some of the activities available in that category. (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 &")) + (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; The test suite wants to write to /homeless-shelter (setenv "HOME" (getcwd)) @@ -498,8 +496,7 @@ specialized device.") #t))) (add-after 'install 'create-executable (lambda* (#:key outputs inputs #:allow-other-keys) - (let* ((python (string-append (assoc-ref inputs "python") - "/bin/python")) + (let* ((python (search-input-file inputs "/bin/python")) (out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (executable (string-append bin "/childsplay"))) @@ -854,8 +851,8 @@ stored and user can review his performance in any time.") (string-prefix? "python-" label))) inputs))) (qtwebengineprocess - (string-append (assoc-ref inputs "qtwebengine") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (search-input-file inputs + "lib/qt5/libexec/QtWebEngineProcess"))) ;; The program fails to find the QtWebEngineProcess program, so ;; we set QTWEBENGINEPROCESS_PATH to help it. PYTHONPATH is ;; wrapped to avoid declaring Python libraries as propagated @@ -867,7 +864,7 @@ stored and user can review his performance in any time.") `("PATH" prefix (,(string-append (assoc-ref inputs "mpv") "/bin"))) - `("PYTHONPATH" = ,site-packages))) + `("GUIX_PYTHONPATH" = ,site-packages))) (find-files bin "."))) #t))))) (native-inputs @@ -925,8 +922,13 @@ endless. For example: (file-name (git-file-name name version)) (sha256 (base32 "13q02xpmps9qg8zrzzy2gzv4a6afgi28lxk4z242j780v0gphchp")) - (patches - (search-patches "t4k-common-libpng16.patch")))) + (patches (search-patches "t4k-common-libpng16.patch")) + (modules '((guix build utils))) + (snippet + `(begin + (substitute* "src/t4k_common.h" + (("char wrapped_lines") "extern char wrapped_lines")) + #t)))) (build-system cmake-build-system) (arguments `(#:tests? #f ;FIXME: cannot find how to run tests @@ -934,9 +936,10 @@ endless. For example: (modify-phases %standard-phases (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPATH" (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))))) + (setenv "CPATH" + (string-append + (search-input-directory inputs "/include/SDL") + ":" (or (getenv "CPATH") ""))))) (add-after 'unpack 'fix-andika-font-path (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/t4k_sdl.c" @@ -975,6 +978,9 @@ TuxMath and TuxType.") ;; Unbundle fonts. (snippet `(begin + ;; Remove duplicate definition. + (substitute* "src/menu_lan.c" + (("lan_player_type.*MAX_CLIENTS\\];") "")) (for-each delete-file (find-files "data/fonts" "\\.ttf$")) #t)))) (build-system gnu-build-system) @@ -985,10 +991,10 @@ TuxMath and TuxType.") (add-after 'set-paths 'set-sdl-paths (lambda* (#:key inputs #:allow-other-keys) (setenv "CPATH" - (string-append (assoc-ref inputs "sdl") - "/include/SDL:" - (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "/include/SDL") + ":" + (or (getenv "CPATH") ""))))) (add-after 'install 'install-desktop-file (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |