ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-26 06:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guile-sdl, guile-sly: Switch to Guile 2.2.

Browse source 
* gnu/packages/sdl.scm (guile-sdl)[inputs]: Replace GUILE-2.0 with
GUILE-2.2.
[arguments]: Add 'skip-cursor-test' phase.
* gnu/packages/guile.scm (guile-sly)[propagated-inputs]: Switch to
GUILE-2.2.
This commit is contained in:
Ludovic Courtès 2017-10-14 15:24:19 +02:00
parent 44394ef917
commit 8380a18176
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/guile.scm
View file

@ -1374,7 +1374,7 @@ (define-public guile-sly
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(propagated-inputs (propagated-inputs
`(("guile" ,guile-2.0) `(("guile" ,guile-2.2)
("guile-sdl" ,guile-sdl) ("guile-sdl" ,guile-sdl)
("guile-opengl" ,guile-opengl))) ("guile-opengl" ,guile-opengl)))
(inputs (inputs

12
gnu/packages/sdl.scm
View file

@ -403,7 +403,7 @@ (define-public guile-sdl
("xorg-server" ,xorg-server) ("xorg-server" ,xorg-server)
("libjpeg" ,libjpeg))) ("libjpeg" ,libjpeg)))
(inputs (inputs
`(("guile" ,guile-2.0) `(("guile" ,guile-2.2)
("sdl-union" ,(sdl-union)))) ("sdl-union" ,(sdl-union))))
(arguments (arguments
'(#:configure-flags '(#:configure-flags
@ -446,6 +446,16 @@ (define-public guile-sdl
(system (format #f "~a/bin/Xvfb :1 &" (system (format #f "~a/bin/Xvfb :1 &"
(assoc-ref inputs "xorg-server"))) (assoc-ref inputs "xorg-server")))
(setenv "DISPLAY" ":1") (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))))) #t)))))
(synopsis "Guile interface for SDL (Simple DirectMedia Layer)") (synopsis "Guile interface for SDL (Simple DirectMedia Layer)")
(description "Guile-SDL is a set of bindings to the Simple DirectMedia (description "Guile-SDL is a set of bindings to the Simple DirectMedia