[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/22: gnu: graphite2: Build against Python 3.
From: |
guix-commits |
Subject: |
12/22: gnu: graphite2: Build against Python 3. |
Date: |
Sun, 7 Jul 2019 19:04:43 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit c4fa39188a9f198c99de528794cc7b3c4a053911
Author: Marius Bakke <address@hidden>
Date: Sun Jul 7 18:53:32 2019 +0200
gnu: graphite2: Build against Python 3.
Previously, the Python tests were skipped, because they require Python 3.
* gnu/packages/fontutils.scm (graphite2)[arguments]: New field.
[native-inputs]: Change PYTHON-2 and PYTHON2-FONTTOOLS to PYTHON and
PYTHON-FONTTOOLS.
---
gnu/packages/fontutils.scm | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 818d77f..725d3ac 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2018 Ludovic Courtès <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -438,9 +439,20 @@ applications should be.")
(base32
"01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx"))))
(build-system cmake-build-system)
+ (arguments
+ `(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'adjust-test-PYTHONPATH
+ (lambda _
+ ;; Tell the build system not to override PYTHONPATH
+ ;; while running the Python tests.
+ (substitute* "Graphite.cmake"
+ (("ENVIRONMENT PYTHONPATH=")
+ (string-append "ENVIRONMENT PYTHONPATH="
+ (getenv "PYTHONPATH") ":")))
+ #t)))))
(native-inputs
- `(("python" ,python-2) ; because of "import imap" in tests
- ("python-fonttools" ,python2-fonttools)))
+ `(("python" ,python)
+ ("python-fonttools" ,python-fonttools)))
(inputs
`(("freetype" ,freetype)))
(synopsis "Reimplementation of the SIL Graphite text processing engine")
- 02/22: gnu: icu4c: Use 'python-minimal' for tests., (continued)
- 02/22: gnu: icu4c: Use 'python-minimal' for tests., guix-commits, 2019/07/07
- 01/22: gnu: Python: Avoid needless reference on coreutils., guix-commits, 2019/07/07
- 04/22: gnu: cURL: Build against Python 3., guix-commits, 2019/07/07
- 03/22: gnu: icu4c: Enable tests on i686., guix-commits, 2019/07/07
- 13/22: gnu: libpsl: Python is a native input., guix-commits, 2019/07/07
- 08/22: gnu: ninja: Python is a regular input., guix-commits, 2019/07/07
- 07/22: gnu: ninja: Build against Python 3., guix-commits, 2019/07/07
- 21/22: gnu: python-pluggy: Update to 0.11.0., guix-commits, 2019/07/07
- 14/22: build-system/meson: Enable compiler optimizations., guix-commits, 2019/07/07
- 06/22: gnu: libevent: Use Python 3 for event_rpcgen.py., guix-commits, 2019/07/07
- 12/22: gnu: graphite2: Build against Python 3.,
guix-commits <=
- 11/22: gnu: zziplib: Don't run failing tests., guix-commits, 2019/07/07
- 19/22: gnu: jalv: Remove GCC5 workaround., guix-commits, 2019/07/07
- 09/22: gnu: libpsl: Build against Python 3., guix-commits, 2019/07/07
- 05/22: gnu: itstool: Update to 2.0.6., guix-commits, 2019/07/07
- 15/22: gnu: libinput: Use the 'release' Meson build type., guix-commits, 2019/07/07
- 17/22: gnu: doxygen: Build with Python 3., guix-commits, 2019/07/07
- 10/22: gnu: zziplib: Don't use unstable tarball., guix-commits, 2019/07/07
- 20/22: gnu: webkitgtk: Build with Python 3., guix-commits, 2019/07/07
- 22/22: gnu: python-pytest: Update to 4.4.2., guix-commits, 2019/07/07
- 16/22: gnu: doxygen: Don't build against special Flex variant., guix-commits, 2019/07/07