From d3abd5cd8b16a9a4121da08a2778dd8a3b9cbae6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 3 Nov 2021 22:27:21 +0200 Subject: [PATCH] gnu: simgear: Remove bundled expat. * gnu/packages/games.scm (simgear)[source]: Add snippet to remove bundled expat. [arguments]: Add configure-flag to use system expat. --- gnu/packages/games.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 1ea1846c0a..df32a6b27d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9269,10 +9269,18 @@ (define simgear (version-major+minor version) "/" "simgear-" version ".tar.bz2")) (sha256 - (base32 "0g2g3n3sb6kdimvcrn9kvlhyyrp5c6lx20fgzz8l609v5aygr3dv")))) + (base32 "0g2g3n3sb6kdimvcrn9kvlhyyrp5c6lx20fgzz8l609v5aygr3dv")) + (modules '((guix build utils))) + (snippet + '(begin + ;; There are some bundled libraries. + (for-each delete-file-recursively + '("3rdparty/expat/")) + #t)))) (build-system cmake-build-system) (arguments - `(#:phases + `(#:configure-flags (list "-DSYSTEM_EXPAT=ON") + #:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys)