Archived
1
0
Fork 0

gnu: xmoto: Unbundle ODE and libccd.

* gnu/packages/games.scm (xmoto): Unbundle ODE and libccd.
[inputs]: Add ode.
This commit is contained in:
Nicolas Goaziou 2020-06-21 01:47:05 +02:00
parent fb5296605e
commit 027285691a
No known key found for this signature in database
GPG key ID: DA00B4F048E92F2D

View file

@ -10438,14 +10438,11 @@ This package is part of the KDE games module.")
(modules '((guix build utils) (modules '((guix build utils)
(ice-9 ftw) (ice-9 ftw)
(srfi srfi-1))) (srfi srfi-1)))
;; XXX: Remove some bundled libraries. Guix provides ;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but
;; Chipmunk, but it appears to be incompatible with the ;; it appears to be incompatible with the (older) one bundled.
;; (older) one bundled. Likewise, Guix provides ODE, but
;; using it induces rendering issues. Eventually, libccd is
;; required to compile built-in ODE.
(snippet (snippet
`(begin `(begin
(let ((keep '("chipmunk" "glad" "libccd" "md5sum" "ode"))) (let ((keep '("chipmunk" "glad" "md5sum")))
(with-directory-excursion "vendor" (with-directory-excursion "vendor"
(for-each delete-file-recursively (for-each delete-file-recursively
(lset-difference string=? (lset-difference string=?
@ -10510,6 +10507,7 @@ This package is part of the KDE games module.")
("libxdg-basedir" ,libxdg-basedir) ("libxdg-basedir" ,libxdg-basedir)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("lua" ,lua-5.1) ("lua" ,lua-5.1)
("ode" ,ode)
("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("zlib" ,zlib))) ("zlib" ,zlib)))