From 97a6a107bc79c03093cef4b5a313caf5e5e98973 Mon Sep 17 00:00:00 2001 From: Patrick Norton Date: Thu, 4 Dec 2025 07:02:29 -0500 Subject: [PATCH] gnu: simgear: Unbundle tinygltf. * gnu/packages/games.scm (simgear)[source]: Remove bundled tinygltf. [arguments]<#:phases>{fix-tiny-gltf}: New phase. [inputs]: Update to modern style. Add tinygltf. Change-Id: I3b85ce8c679bf1ef0f5daa82f68060bb331b9eed Signed-off-by: Andreas Enge --- gnu/packages/games.scm | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4cd789736ffc2fff761bfb7b4dbdbe5bf1830ef9..8189ae371bcc568d54177185f23e16648c15ddef 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -10869,21 +10869,32 @@ levels to unlock.") '(begin ;; There are some bundled libraries. (for-each delete-file-recursively - '("3rdparty/expat/")) + '("3rdparty/expat/" + "3rdparty/tiny_gltf/")) #t)))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DSYSTEM_EXPAT=ON") - #:test-exclude "(http|dns|repository|catalog)")) + #:test-exclude "(http|dns|repository|catalog)" + #:phases + ,#~(modify-phases %standard-phases + (add-after 'unpack 'fix-tiny-gltf + (lambda _ + (substitute* "3rdparty/CMakeLists.txt" + (("add_subdirectory\\(tiny_gltf\\)") "")) + (substitute* "simgear/CMakeLists.txt" + (("FGTinyGLTF") "tinygltf"))))))) (inputs - `(("boost" ,boost) - ("c-ares" ,c-ares) - ("curl" ,curl) - ("expat" ,expat) - ("mesa" ,mesa) - ("openal" ,openal) - ("openscenegraph" ,openscenegraph) - ("zlib" ,zlib))) + (list boost + c-ares + curl + expat + mesa + nlohmann-json + openal + openscenegraph + tinygltf + zlib)) (home-page "https://home.flightgear.org/") (synopsis "Libraries for 3D simulations and games") (description "SimGear is a set of libraries designed to be used as