03/103: guix: build all Python packages with --single-version-externally-managed.

[Hartmut Goebel]

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

commit 6945e8a287bfa5aa645876a8ff5bfbb6f66d1880
Author: Hartmut Goebel <address@hidden>
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. Remove now unused argument "inputs".
---
 guix/build/python-build-system.scm |   23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/guix/build/python-build-system.scm 
b/guix/build/python-build-system.scm
index e906e60..2424fed 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2013 Andreas Enge <address@hidden>
 ;;; Copyright © 2013 Nikita Karetnikov <address@hidden>
 ;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2016 Hartmut Goebel <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,25 +61,15 @@
          (major+minor (take components 2)))
     (string-join major+minor ".")))
 
-(define* (install #:key outputs inputs (configure-flags '())
+(define* (install #:key outputs (configure-flags '())
                   #: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)