[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:47:57 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 59f0d0a39fd2628dbf39f958a94aac799d551a47
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"
- 11/103: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a), (continued)
- 11/103: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1a), Hartmut Goebel, 2016/10/25
- 80/103: gnu: python-tox: Update FIXME comments., Hartmut Goebel, 2016/10/25
- 100/103: gnu: python-scikit-learn: Remove useless property "python2-variant"., Hartmut Goebel, 2016/10/25
- 99/103: gnu: python-tables: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 101/103: Add a series of FIXME and TODO comments., Hartmut Goebel, 2016/10/25
- 16/103: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b), Hartmut Goebel, 2016/10/25
- 43/103: gnu: python-fonttools: Remove intervening directory in site-packges., Hartmut Goebel, 2016/10/25
- 36/103: gnu: python-pbr: Rework bootstrapping., Hartmut Goebel, 2016/10/25
- 75/103: gnu: python-configobj: Correct inputs., Hartmut Goebel, 2016/10/25
- 85/103: gnu: python-responses: Correct inputs, Hartmut Goebel, 2016/10/25
- 93/103: gnu: khal: Fix build.,
Hartmut Goebel <=
- 96/103: gnu: python-pytest-django: Remove needless propagated input "python-py"., Hartmut Goebel, 2016/10/25
- 92/103: gnu: python-testlib: Remove useless self-defined phase "unpack"., Hartmut Goebel, 2016/10/25
- 98/103: gnu: python-flake8-2.2.4: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 102/103: Add TODO comments., Hartmut Goebel, 2016/10/25
- 87/103: gnu: python-prompt-toolkit: Correct inputs, Hartmut Goebel, 2016/10/25
- 24/103: gnu: Fix python inputs, part 6: some inputs become native-inputs., Hartmut Goebel, 2016/10/25
- 90/103: gnu: python-nautilus: Correct inputs, Hartmut Goebel, 2016/10/25
- 13/103: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2), Hartmut Goebel, 2016/10/25
- 68/103: gnu: python2-scikit-image: Remove needless native-input and inheritance., Hartmut Goebel, 2016/10/25
- 69/103: gnu: python-redis: Remove unused input., Hartmut Goebel, 2016/10/25