aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Tai <atai@atai.org>2021-11-30 21:18:09 -0800
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2021-12-01 21:54:41 +0100
commit2b08cc968bb0b74a3a05fac7355a491d8015343e (patch)
treebbe8636c85a0b7b2800546993df5bfd1e0ab8fae
parentc7c4f8088195a8e6650904de4e16d71b98776a76 (diff)
downloadguix-2b08cc968bb0b74a3a05fac7355a491d8015343e.tar.gz
guix-2b08cc968bb0b74a3a05fac7355a491d8015343e.zip
gnu: bullet: Update to 3.17.
* gnu/packages/game-development.scm (bullet): Update to 3.17. [arguments]<#:configure-flags>: Disable access to third-party libs. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-rw-r--r--gnu/packages/game-development.scm15
1 files changed, 10 insertions, 5 deletions
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 55bbad30e6..a060dc94dc 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -24,6 +24,7 @@
;;; Copyright © 2021 Dmitry Polyakov <polyakov@liltechdude.xyz>
;;; Copyright © 2020-2021 James Smith <jsubuntuxp@disroot.org>
;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2021 Andy Tai <atai@atai.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -112,7 +113,7 @@
(define-public bullet
(package
(name "bullet")
- (version "2.89")
+ (version "3.17")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -121,7 +122,7 @@
(file-name (git-file-name name version))
(sha256
(base32
- "10ncf2z474jnv7p5lv01ak2mk2hib3rj5rz1zr8v2v5pnciqbijl"))
+ "0x1ghxbkvqr910sp01sjf4hlfy4sdgn2jx2qf0dsi697bzq1f3mr"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -131,9 +132,7 @@
'("Gwen" "clsocket" "enet" "glad" "imgui"
"lua-5.2.3" "midi" "minizip" "openvr"
"optionalX11" "serial" "zlib")))
- ;; These need files from ThirdPartyLibs.
- (substitute* "Extras/CMakeLists.txt"
- (("BulletRobotics") ""))
+
;; Tests fail on linking, cannot find -lBussIK.
(substitute* "test/CMakeLists.txt"
((" InverseDynamics")
@@ -146,6 +145,12 @@
"-DBUILD_CPU_DEMOS=OFF"
"-DBUILD_OPENGL3_DEMOS=OFF"
"-DBUILD_BULLET2_DEMOS=OFF"
+ ;; Extras/BulletRoboticsGUI needs files from
+ ;; ThirdPartyLibs
+ "-DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF"
+ ;; Extras/BulletRobotics needs files from
+ ;; ThirdPartyLibs
+ "-DBUILD_BULLET_ROBOTICS_EXTRA=OFF"
(string-append "-DCMAKE_CXX_FLAGS=-fPIC "
(or (getenv "CXXFLAGS") "")))
#:phases