guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

06/08: gnu: simgear: Remove bundled expat.


From: guix-commits
Subject: 06/08: gnu: simgear: Remove bundled expat.
Date: Wed, 3 Nov 2021 18:12:31 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit d3abd5cd8b16a9a4121da08a2778dd8a3b9cbae6
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Nov 3 22:27:21 2021 +0200

    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 1ea1846..df32a6b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -9269,10 +9269,18 @@ levels to unlock.")
                            (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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]