TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: fifengine: Do not alter PYTHONPATH.

Browse source 
* gnu/packages/games.scm (fifengine): Import the (guix build
python-build-system) module.
[phases]{check}: Simplify by using the 'add-installed-pythonpath' procedure.
Remove trailing #t.
This commit is contained in:
Maxim Cournoyer 2021-01-23 21:16:39 -05:00
parent d7354701dc
commit b6a50fae1f
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
gnu/packages/games.scm
View file

@ -3445,9 +3445,12 @@ (define-public fifengine
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; TODO The test running fails to run some tests.
#:modules ((srfi srfi-1)
(guix build cmake-build-system)
(guix build utils))
#: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="
@ -3474,30 +3477,15 @@ (define-public fifengine
(delete 'check)
(add-after 'install 'check
(lambda* (#:key inputs outputs tests? #:allow-other-keys)
(define python-version
(let* ((version (last (string-split
(assoc-ref inputs "python")
#\-)))
(components (string-split version #\.))
(major+minor (take components 2)))
(string-join major+minor ".")))
(when tests?
;; Set PYTHONPATH so that python finds the installed modules.
(setenv "PYTHONPATH"
(string-append (getenv "PYTHONPATH") ":"
(assoc-ref outputs "out")
"/lib/python"
python-version
"/site-packages"))
(add-installed-pythonpath inputs outputs)
;; The tests require an X server.
(system "Xvfb :1 &")
(setenv "DISPLAY" ":1")
(setenv "XDG_RUNTIME_DIR" "/tmp")
;; Run tests
(chdir ,(string-append "../" name "-" version))
(invoke "python3" "run_tests.py" "-a"))
#t)))))
(invoke "python3" "run_tests.py" "-a")))))))
(inputs
`(("sdl2" ,sdl2)
("sdl2-image" ,sdl2-image)