guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

21/131: gnu: python2-virtualenv: Fix build.


From: guix-commits
Subject: 21/131: gnu: python2-virtualenv: Fix build.
Date: Fri, 29 Jan 2021 09:21:47 -0500 (EST)

apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.

commit 5a4042e0ba280e7703b1bc8ae4acb8479b5b2d3b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 08:59:29 2021 -0500

    gnu: python2-virtualenv: Fix build.
    
    * gnu/packages/python-xyz.scm (python2-virtualenv)[arguments]{phases}: 
Remove
    argument.
---
 gnu/packages/python-xyz.scm | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 684da80..3c256f5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3188,28 +3188,7 @@ e.g. filters, callbacks and errbacks can all be 
promises.")
     (package
       (inherit base)
       (arguments
-       `(#:python ,python-2
-         #:phases
-         (modify-phases %standard-phases
-           (add-after 'set-paths 'adjust-PYTHONPATH
-             (lambda* (#:key inputs #:allow-other-keys)
-               (let* ((python (assoc-ref inputs "python"))
-                      (python-sitedir (string-append python "/lib/python2.7"
-                                                     "/site-packages")))
-                 ;; XXX: 'python2' always comes first on PYTHONPATH
-                 ;; and shadows the 'setuptools' input.  Move python2
-                 ;; last: this should be fixed in python-build-system
-                 ;; in a future rebuild cycle.
-                 (setenv "PYTHONPATH"
-                         (string-append (string-join (delete python-sitedir
-                                                             (string-split
-                                                              (getenv 
"PYTHONPATH")
-                                                              #\:))
-                                                     ":")
-                                        ":" python-sitedir))
-                 (format #t "environment variable `PYTHONPATH' changed to 
`~a'~%"
-                         (getenv "PYTHONPATH"))
-                 #t))))))
+       `(#:python ,python-2))
       (propagated-inputs
        `(("python-contextlib2" ,python2-contextlib2)
          ,@(package-propagated-inputs base))))))



reply via email to

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