guix-commits
[Top][All Lists]
Advanced

[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 18:00:43 +0000 (UTC)

htgoebel pushed a commit to branch wip-python-build-system
in repository guix.

commit 6b9489415bbf12b3e328fb68ffa7e6ec3d36a26b
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"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]