[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
76/163: gnu: fifengine: Do not alter PYTHONPATH.
From: |
guix-commits |
Subject: |
76/163: gnu: fifengine: Do not alter PYTHONPATH. |
Date: |
Mon, 25 Jan 2021 02:01:36 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 0c776512fcaaca62c83754a8943d113899b3f304
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Jan 23 21:16:39 2021 -0500
gnu: fifengine: Do not alter PYTHONPATH.
* 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.
---
gnu/packages/games.scm | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 5055395..b122a62 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -3449,9 +3449,12 @@ Widgets, and allows users to create more.")
(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="
@@ -3478,30 +3481,15 @@ Widgets, and allows users to create more.")
(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)
- 51/163: gnu: scanmem: Wrap with the new Guix PYTHONPATH., (continued)
- 51/163: gnu: scanmem: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 39/163: gnu: python-libtmux: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 60/163: gnu: python-django-sortedm2m: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 47/163: gnu: ceph: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 74/163: gnu: intel-xed: Update to 12.0.1., guix-commits, 2021/01/25
- 78/163: gnu: meson-0.55: Update to 0.55.3., guix-commits, 2021/01/25
- 102/163: gnu: asymptote: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 116/163: gnu: passwordsafe: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 83/163: gnu: gimp: Use the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 117/163: gnu: terminator: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 76/163: gnu: fifengine: Do not alter PYTHONPATH.,
guix-commits <=
- 124/163: gnu: python-colorlog: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 118/163: gnu: setzer: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 135/163: gnu: python-multidict: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 134/163: gnu: python-matplotlib-documentation: Do not read PYTHONPATH., guix-commits, 2021/01/25
- 136/163: gnu: python2-backports-shutil-get-terminal-size: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 144/163: gnu: python-odfpy: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 145/163: gnu: python-natsort: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 146/163: gnu: python-validictory: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 151/163: gnu: python-apispec: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 152/163: gnu: python-flasgger: Do not set PYTHONPATH., guix-commits, 2021/01/25