From c4fa39188a9f198c99de528794cc7b3c4a053911 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 7 Jul 2019 18:53:32 +0200 Subject: 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(-) (limited to 'gnu/packages/fontutils.scm') diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 818d77f127..725d3ac878 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2018 Ludovic Courtès +;;; Copyright © 2019 Marius Bakke ;;; ;;; 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") -- cgit v1.2.3