summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-21 01:47:05 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2020-06-21 01:47:05 +0200
commit027285691ae2ac1806cbf19bbdcf9b6e2dd451ff (patch)
treea12405239be22d0a44a97e1cf97423cc16f7c86a
parentgnu: xmoto: Update to 0.6.0-0-f7ca787. (diff)
downloadguix-027285691ae2ac1806cbf19bbdcf9b6e2dd451ff.tar.gz
guix-027285691ae2ac1806cbf19bbdcf9b6e2dd451ff.tar.bz2
guix-027285691ae2ac1806cbf19bbdcf9b6e2dd451ff.tar.xz
gnu: xmoto: Unbundle ODE and libccd.
* gnu/packages/games.scm (xmoto): Unbundle ODE and libccd. [inputs]: Add ode.
-rw-r--r--gnu/packages/games.scm10
1 files changed, 4 insertions, 6 deletions
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d01d3fc..76ddbab 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10438,14 +10438,11 @@ This package is part of the KDE games module.")
10438 (modules '((guix build utils) 10438 (modules '((guix build utils)
10439 (ice-9 ftw) 10439 (ice-9 ftw)
10440 (srfi srfi-1))) 10440 (srfi srfi-1)))
10441 ;; XXX: Remove some bundled libraries. Guix provides 10441 ;; XXX: Remove some bundled libraries. Guix provides Chipmunk, but
10442 ;; Chipmunk, but it appears to be incompatible with the 10442 ;; it appears to be incompatible with the (older) one bundled.
10443 ;; (older) one bundled. Likewise, Guix provides ODE, but
10444 ;; using it induces rendering issues. Eventually, libccd is
10445 ;; required to compile built-in ODE.
10446 (snippet 10443 (snippet
10447 `(begin 10444 `(begin
10448 (let ((keep '("chipmunk" "glad" "libccd" "md5sum" "ode"))) 10445 (let ((keep '("chipmunk" "glad" "md5sum")))
10449 (with-directory-excursion "vendor" 10446 (with-directory-excursion "vendor"
10450 (for-each delete-file-recursively 10447 (for-each delete-file-recursively
10451 (lset-difference string=? 10448 (lset-difference string=?
@@ -10510,6 +10507,7 @@ This package is part of the KDE games module.")
10510 ("libxdg-basedir" ,libxdg-basedir) 10507 ("libxdg-basedir" ,libxdg-basedir)
10511 ("libxml2" ,libxml2) 10508 ("libxml2" ,libxml2)
10512 ("lua" ,lua-5.1) 10509 ("lua" ,lua-5.1)
10510 ("ode" ,ode)
10513 ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf))) 10511 ("sdl" ,(sdl-union (list sdl sdl-mixer sdl-net sdl-ttf)))
10514 ("sqlite" ,sqlite) 10512 ("sqlite" ,sqlite)
10515 ("zlib" ,zlib))) 10513 ("zlib" ,zlib)))