diff options
author | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
---|---|---|
committer | Thomas Danckaert <thomas.danckaert@gmail.com> | 2017-10-16 19:52:30 +0200 |
commit | 8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb (patch) | |
tree | 7177d90f3a8f0ba34630e78b5516dbda68ff0570 /gnu/packages/sdl.scm | |
parent | 404e3d8b1bcd92ad934711fe759feb220f4d1c60 (diff) | |
parent | 484a72a036e6a8af43f517d6547446f3de344a07 (diff) | |
download | guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar guix-8cff2e7aed888b3d0e4dcfcda151bc8af68fa1bb.tar.gz |
Merge 'master' into core-updates
Diffstat (limited to 'gnu/packages/sdl.scm')
-rw-r--r-- | gnu/packages/sdl.scm | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 0962ffe985..d3edac14ff 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -403,13 +403,18 @@ directory.") ("xorg-server" ,xorg-server) ("libjpeg" ,libjpeg))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("sdl-union" ,(sdl-union)))) (arguments '(#:configure-flags (list (string-append "--with-sdl-prefix=" (assoc-ref %build-inputs "sdl-union"))) + #:modules ((ice-9 popen) + (guix build utils) + (guix build gnu-build-system)) + #:parallel-build? #f ; parallel build fails + #:phases (modify-phases %standard-phases (add-before 'configure 'fix-env-and-patch @@ -418,9 +423,16 @@ directory.") ;; SDL_image needs to dlopen libjpeg in the test suite. (setenv "LD_LIBRARY_PATH" (string-append (assoc-ref inputs "libjpeg") "/lib")) - ;; Change the site directory /site/2.0 like Guile expects. + + ;; Change the site directory /site/X.Y like Guile expects. (substitute* "build-aux/guile-baux/re-prefixed-site-dirs" - (("\"/site\"") "\"/site/2.0\"")) + (("\"/site\"") + (let ((effective + (read + (open-pipe* OPEN_READ + "guile" "-c" + "(write (effective-version))")))) + (string-append "\"/site/" effective "\"")))) ;; Skip tests that rely on sound support, which is unavailable in ;; the build environment. @@ -434,6 +446,16 @@ directory.") (system (format #f "~a/bin/Xvfb :1 &" (assoc-ref inputs "xorg-server"))) (setenv "DISPLAY" ":1") + #t)) + (add-before 'check 'skip-cursor-test + (lambda _ + ;; XXX: This test sometimes enters an endless loop, and sometimes + ;; crashes with: + ;; guile: xcb_io.c:147: append_pending_request: Assertion `!xcb_xlib_unknown_seq_number' failed. + ;; Skip it. + (substitute* "test/cursor.scm" + (("\\(SDL:init .*" all) + (string-append "(exit 77) ;" all "\n"))) #t))))) (synopsis "Guile interface for SDL (Simple DirectMedia Layer)") (description "Guile-SDL is a set of bindings to the Simple DirectMedia |