[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
93/103: gnu: khal: Fix build.
From: |
Hartmut Goebel |
Subject: |
93/103: gnu: khal: Fix build. |
Date: |
Tue, 25 Oct 2016 17:44:46 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 86ede7201e92cf0f5e4cc4b82c6d0ec0c0067830
Author: Hartmut Goebel <address@hidden>
Date: Wed Oct 19 23:19:26 2016 +0200
gnu: khal: Fix build.
The old one was plain wrong and only worked by luck since the old
python build system did manipulate PYTHONPATH.
* gnu/packages/calendar.scm(khal)[phase manpage]: Use
add-installed-pythonpath.
---
gnu/packages/calendar.scm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 306c949..447dcd6 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -96,10 +96,9 @@ data units.")
`(#:phases (modify-phases %standard-phases
;; Building the manpage requires khal to be installed.
(add-after 'install 'manpage
- (lambda* (#:key outputs #:allow-other-keys)
- (setenv "PYTHONPATH"
- (string-append
- (getenv "PYTHONPATH") ":" (assoc-ref outputs "out")))
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ ;; Make installed package available for running the tests
+ (add-installed-pythonpath inputs outputs)
(zero? (system* "make" "--directory=doc/" "man"))
(install-file
"doc/build/man/khal.1"
- 77/103: gnu: python-websocket-client: Correct inputs., (continued)
- 77/103: gnu: python-websocket-client: Correct inputs., Hartmut Goebel, 2016/10/25
- 78/103: gnu: python-wsgi-intercept: Correct inputs., Hartmut Goebel, 2016/10/25
- 79/103: gnu: python-urllib3: update comment., Hartmut Goebel, 2016/10/25
- 81/103: gnu: Remove some outdated comments., Hartmut Goebel, 2016/10/25
- 87/103: gnu: python-prompt-toolkit: Correct inputs, Hartmut Goebel, 2016/10/25
- 91/103: gnu: python-sphinxcontrib-newsfeed: Remove needless input., Hartmut Goebel, 2016/10/25
- 90/103: gnu: python-nautilus: Correct inputs, Hartmut Goebel, 2016/10/25
- 95/103: gnu: python2-pbcore: Fix inputs:, Hartmut Goebel, 2016/10/25
- 99/103: gnu: python-tables: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 96/103: gnu: python-pytest-django: Remove needless propagated input "python-py"., Hartmut Goebel, 2016/10/25
- 93/103: gnu: khal: Fix build.,
Hartmut Goebel <=
- 97/103: gnu: python-flake8: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 11/103: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a), Hartmut Goebel, 2016/10/25
- 103/103: Add a FIXME comment, Hartmut Goebel, 2016/10/25
- 101/103: Add a series of FIXME and TODO comments., Hartmut Goebel, 2016/10/25
- 89/103: gnu: python-freezegun: Correct input., Hartmut Goebel, 2016/10/25
- 86/103: gnu: python-pika: Correct input., Hartmut Goebel, 2016/10/25
- 19/103: gnu: Fix python inputs, part 1: all inputs become propagated-inputs., Hartmut Goebel, 2016/10/25
- 92/103: gnu: python-testlib: Remove useless self-defined phase "unpack"., Hartmut Goebel, 2016/10/25
- 82/103: gnu: python-celery: Remove needless inputs., Hartmut Goebel, 2016/10/25
- 83/103: gnu: python-sphinx-repoze-autointerface: Remove needless input., Hartmut Goebel, 2016/10/25