apteryx pushed a commit to branch master
in repository guix.
commit 8b38443700f6f24756ae51bbcc4bfcd5d7382a17
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Tue Oct 29 21:02:25 2024 +0900
gnu: bullet: Modernize.
* gnu/packages/game-development.scm (bullet)
[source]: Remove trailing #t in snippet.
[arguments]: Use gexps. Remove trailing #t in phase.
Change-Id: I8792845f83acfffc8be40cc453fcf9d0c3c4e2df
---
gnu/packages/game-development.scm | 67 +++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index 71a11bc61b..01143c0793 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -139,8 +139,8 @@
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/bulletphysics/bullet3/";)
- (commit version)))
+ (url "https://github.com/bulletphysics/bullet3/";)
+ (commit version)))
(file-name (git-file-name name version))
(sha256
(base32
@@ -158,41 +158,38 @@
;; Tests fail on linking, cannot find -lBussIK.
(substitute* "test/CMakeLists.txt"
((" InverseDynamics")
- "../examples/ThirdPartyLibs/BussIK InverseDynamics"))
- ; (("SharedMemory") ""))
- #t))))
+ "../examples/ThirdPartyLibs/BussIK InverseDynamics"))))))
(build-system cmake-build-system)
(arguments
- '(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
- "-DBUILD_CPU_DEMOS=OFF"
- "-DBUILD_OPENGL3_DEMOS=OFF"
- "-DBUILD_BULLET2_DEMOS=OFF"
- ;; openmw 0.47.0 requires bullet to be built
with
- ;; double precision.
- ;; See <https://issues.guix.gnu.org/52953> for
- ;; more information.
- "-DUSE_DOUBLE_PRECISION=ON"
- ;; 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
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-failing-tests
- ;; These tests fail specifically after removing 3rd party code.
- (lambda _
- (substitute* "test/SharedMemory/CMakeLists.txt"
- (("ADD_TEST") "# ADD_TEST"))
- (substitute* "test/InverseDynamics/CMakeLists.txt"
- (("ADD_TEST\\(Test_BulletInverseForward")
- "# ADD_TEST(Test_BulletInverseForward"))
- #t)))))
- (inputs
- (list glu libx11 mesa))
+ (list #:configure-flags
+ #~(list "-DBUILD_SHARED_LIBS=ON"
+ "-DBUILD_CPU_DEMOS=OFF"
+ "-DBUILD_OPENGL3_DEMOS=OFF"
+ "-DBUILD_BULLET2_DEMOS=OFF"
+ ;; openmw 0.47.0 requires bullet to be built with
+ ;; double precision.
+ ;; See <https://issues.guix.gnu.org/52953> for
+ ;; more information.
+ "-DUSE_DOUBLE_PRECISION=ON"
+ ;; 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
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-tests
+ ;; These tests fail specifically after removing 3rd party
code.
+ (lambda _
+ (substitute* "test/SharedMemory/CMakeLists.txt"
+ (("ADD_TEST") "# ADD_TEST"))
+ (substitute* "test/InverseDynamics/CMakeLists.txt"
+ (("ADD_TEST\\(Test_BulletInverseForward")
+ "# ADD_TEST(Test_BulletInverseForward")))))))
+ (inputs (list glu libx11 mesa))
(home-page "https://pybullet.org/wordpress/";)
(synopsis "3D physics engine library")
(description
