guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: grass: Fix start-up without python@3 in profile.


From: guix-commits
Subject: 02/02: gnu: grass: Fix start-up without python@3 in profile.
Date: Fri, 16 Oct 2020 17:09:45 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit 6c03d15d7d84c00b02efea0a60e91f55f5541b57
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Oct 16 21:07:06 2020 +0200

    gnu: grass: Fix start-up without python@3 in profile.
    
    * gnu/packages/geo.scm (grass)[arguments]: Rename ‘wrap-python’ phase to
    ‘python:wrap’.  Add ‘wrap-with-python-interpreter’ phase.
---
 gnu/packages/geo.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index b094b55..09afa65 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1865,8 +1865,14 @@ track your position right from your laptop.")
                  (symlink (string-append dir "/lib")
                           (string-append out "/lib")))
                #t))
-           (add-after 'install-links 'wrap-python
-             (assoc-ref python:%standard-phases 'wrap)))))
+           (add-after 'install-links 'python:wrap
+             (assoc-ref python:%standard-phases 'wrap))
+           (add-after 'python:wrap 'wrap-with-python-interpreter
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (wrap-program (string-append out "/bin/" ,grassxx)
+                   `("GRASS_PYTHON" = (,(which "python3"))))
+                 #t))))))
       (synopsis "GRASS Geographic Information System")
       (description
        "GRASS (Geographic Resources Analysis Support System), is a Geographic



reply via email to

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