From 52d945d382041488f8e71c0fb8af874ede148512 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 25 Dec 2021 23:18:04 +0100 Subject: gnu: fifengine: Fix build. * gnu/packages/patches/fifengine-boost-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/games.scm (fifengine)[source](patches): Add it. [arguments]: Remove defunct Python module import. --- gnu/packages/games.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'gnu/packages/games.scm') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index fa6865c050..496e600c17 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -3726,19 +3726,14 @@ (define-public fifengine (uri (string-append "https://codeload.github.com/fifengine/" "fifengine/tar.gz/" version)) (file-name (string-append name "-" version ".tar.gz")) - (patches (search-patches "fifengine-swig-compat.patch")) + (patches (search-patches "fifengine-swig-compat.patch" + "fifengine-boost-compat.patch")) (sha256 (base32 "1y4grw25cq5iqlg05rnbyxw1njl11ypidnlsm3qy4sm3xxdvb0p8")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; TODO The test running fails to run some tests. - #:imported-modules ,(cons '(guix build python-build-system) - %cmake-build-system-modules) - #:modules ((guix build cmake-build-system) - ((guix build python-build-system) #:select (guix-pythonpath)) - (guix build utils) - (srfi srfi-1)) #:configure-flags (list (string-append "-DOPENALSOFT_INCLUDE_DIR=" @@ -3764,9 +3759,8 @@ (define-public fifengine ;; python modules. (delete 'check) (add-after 'install 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (lambda* (#:key tests? #:allow-other-keys) (when tests? - (add-installed-pythonpath inputs outputs) ;; The tests require an X server. (system "Xvfb :1 &") (setenv "DISPLAY" ":1") -- cgit v1.2.3