From 9fda25caff4f7e7df375dec44804c4cebb1a0643 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 9 Aug 2022 21:23:22 +0200 Subject: [PATCH] gnu: box2d: Unbundle doctest. * gnu/packages/game-development.scm (box2d)[source](snippet): Delete doctest, and adjust accordingly. [native-inputs]: Add DOCTEST. --- gnu/packages/game-development.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 090e7f7d128..3e0301a199c 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2017 Peter Mikkelsen ;;; Copyright © 2017 Arun Isaac ;;; Copyright © 2017, 2019 Rutger Helling -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2022 Marius Bakke ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler ;;; Copyright © 2019 Jethro Cao @@ -2467,13 +2467,23 @@ rigid body physics library written in C.") (modules '((guix build utils))) (snippet '(begin - ;; Bundled code only used for the testbed. - (delete-file-recursively "extern"))))) + ;; Remove bundled code only used for the testbed. + (delete-file-recursively "extern") + ;; Remove bundled copy of doctest, and adjust tests accordingly. + (delete-file "unit-test/doctest.h") + (substitute* "unit-test/CMakeLists.txt" + (("doctest\\.h") + "")) + (substitute* (find-files "unit-test" "\\.cpp$") + (("include \"doctest\\.h\"") + "include ")))))) (build-system cmake-build-system) (arguments `(#:test-target "unit_test" #:configure-flags '("-DBUILD_SHARED_LIBS=ON" "-DBOX2D_BUILD_TESTBED=OFF"))) + (native-inputs + (list doctest)) ;for tests (inputs (list libx11)) (home-page "https://box2d.org/")