35/163: gnu: gitless: Wrap with the new Guix PYTHONPATH.

[guix-commits]

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

commit f9d84f95149ef2f7a74a7f856ea29e741a1c1cf4
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 22:32:42 2021 -0500

    gnu: gitless: Wrap with the new Guix PYTHONPATH.
    
    * gnu/packages/version-control.scm (gitless)
    [phases]: Delete trailing #t.
    {wrap}: Wrap with the new Guix PYTHONPATH.
---
 gnu/packages/version-control.scm | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 54b9a33..663a97f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -33,6 +33,7 @@
 ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -600,8 +601,7 @@ everything from small to very large projects with speed and 
efficiency.")
            (lambda _
              (substitute* "setup.py"
                ;; Using Guix's python-pygit2 1.1.0 appears to work fine…
-               (("pygit2==") "pygit2>="))
-             #t))
+               (("pygit2==") "pygit2>="))))
          (add-before 'check 'prepare-for-tests
            (lambda _
              ;; Find the 'gl' command.
@@ -615,16 +615,11 @@ everything from small to very large projects with speed 
and efficiency.")
          (replace 'wrap
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out"))
-                   (git (assoc-ref inputs "git")))
+                   (git (assoc-ref inputs "git"))
+                   (pythonpath (guix-pythonpath inputs)))
                (wrap-program (string-append out "/bin/gl")
                  `("PATH" ":" prefix (,(string-append git "/bin")))
-                 `("PYTHONPATH" ":" =
-                   (,(string-append out "/lib/python"
-                                    ,(version-major+minor
-                                      (package-version python))
-                                    "/site-packages:")
-                    ,(getenv "PYTHONPATH"))))
-               #t))))))
+                 `(,pythonpath ":" = (,(getenv pythonpath))))))))))
     (native-inputs
      `(("git-for-tests" ,git-minimal)))
     (inputs