This is an automated email from the git hooks/post-receive script.
mbakke pushed a commit to branch core-updates
in repository guix.
The following commit(s) were added to refs/heads/core-updates by this push:
new 68c7f57 gnu: hplip: Fix build with Python 3.8.
68c7f57 is described below
commit 68c7f577d8cbb1a11a812e36c7ae1e34ccc57e62
Author: Marius Bakke <[email protected]>
AuthorDate: Mon May 4 17:27:17 2020 +0200
gnu: hplip: Fix build with Python 3.8.
* gnu/packages/cups.scm (hplip)[arguments]: Add phase
"fix-build-with-python-3.8".
---
gnu/packages/cups.scm | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index 9161b7b..b253d06 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2017 Leo Famulari <[email protected]>
;;; Copyright © 2017 Mark H Weaver <[email protected]>
;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <[email protected]>
+;;; Copyright © 2020 Marius Bakke <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -536,7 +537,20 @@ should only be used as part of the Guix cups-pk-helper
service.")
(string-append "rulessystemdir = " out
"/lib/systemd/system"))
(("/etc/sane.d")
- (string-append out "/etc/sane.d"))))))
+ (string-append out "/etc/sane.d")))
+ #t)))
+ (add-before 'configure 'fix-build-with-python-3.8
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((python (assoc-ref inputs "python")))
+ ;; XXX: The configure script of looks for Python headers in the
+ ;; wrong places as of version 3.20.3. Help it by adding the
+ ;; include directory on C_INCLUDE_PATH.
+ (when python
+ (setenv "C_INCLUDE_PATH"
+ (string-append python "/include/python"
+ (python:python-version python)
+ ":" (getenv "C_INCLUDE_PATH"))))
+ #t)))
(add-after 'install 'install-models-dat
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
