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

commit 2c37e36ac6c06c49f73feb7cf03c82958704272a
Author: Hartmut Goebel <h.goe...@crazy-compilers.com>
Date:   Wed Sep 28 10:42:35 2016 +0200

    guix: build all Python packages with --single-version-externally-managed.
    
    This requires setuptools to be installed together with python, which is
    the case for Python 3 anyway and which we do for our build of Python 2
    (see last commit).
    
    * guix/build/python-build-system.scm (install): Add
      "--single-version-externally-managed" and "--root=/" to params to be
      passed to call-setuppy. Remove thus needless manipulation of
      PYTHONPATH.
---
 guix/build/python-build-system.scm |   21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/guix/build/python-build-system.scm 
b/guix/build/python-build-system.scm
index 9109fb4..d07b83f 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2013 Andreas Enge <andr...@enge.fr>
 ;;; Copyright © 2013 Nikita Karetnikov <nik...@karetnikov.org>
 ;;; Copyright © 2015 Mark H Weaver <m...@netris.org>
+;;; Copyright © 2016 Hartmut Goebel <h.goe...@crazy-compilers.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,21 +65,11 @@
                   #:allow-other-keys)
   "Install a given Python package."
   (let* ((out (assoc-ref outputs "out"))
-         (params (append (list (string-append "--prefix=" out))
-                         configure-flags))
-         (python-version (get-python-version (assoc-ref inputs "python")))
-         (old-path (getenv "PYTHONPATH"))
-         (add-path (string-append out "/lib/python" python-version
-                                  "/site-packages/")))
-        ;; create the module installation directory and add it to PYTHONPATH
-        ;; to make setuptools happy
-        (mkdir-p add-path)
-        (setenv "PYTHONPATH"
-                (string-append (if old-path
-                                   (string-append old-path ":")
-                                   "")
-                               add-path))
-        (call-setuppy "install" params)))
+         (params (append (list (string-append "--prefix=" out)
+                               "--single-version-externally-managed"
+                               "--root=/")
+                         configure-flags)))
+    (call-setuppy "install" params)))
 
 (define* (wrap #:key inputs outputs #:allow-other-keys)
   (define (list-of-files dir)

Reply via email to