guix-commits
[Top][All Lists]
Advanced

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

121/131: gnu: freecad: Wrap with GUIX_PYTHONPATH.


From: guix-commits
Subject: 121/131: gnu: freecad: Wrap with GUIX_PYTHONPATH.
Date: Mon, 1 Feb 2021 11:57:06 -0500 (EST)

apteryx pushed a commit to branch core-updates
in repository guix.

commit 8454438e0532aa026534510a0f6677552fc0e810
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 27 21:16:22 2021 -0500

    gnu: freecad: Wrap with GUIX_PYTHONPATH.
    
    * gnu/packages/engineering.scm (freecad)
    [phases]{restore-pythonpath}: Delete phase.
    {wrap-pythonpath}: Replace PYTHONPATH with GUIX_PYTHONPATH.
---
 gnu/packages/engineering.scm | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index c9e90c4..bcc6ddb 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2591,18 +2591,12 @@ full programmatic control over your models.")
                          "/include/shiboken2"))
          #:phases
          (modify-phases %standard-phases
-           (add-before 'configure 'restore-pythonpath
-             (lambda _
-               (substitute* "src/Main/MainGui.cpp"
-                 (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
-               #t))
            (add-after 'install 'wrap-pythonpath
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((out (assoc-ref outputs "out")))
                  (wrap-program (string-append out "/bin/FreeCAD")
-                   (list "PYTHONPATH"
-                         'prefix (list (getenv "GUIX_PYTHONPATH")))))
-               #t)))))
+                   (list "GUIX_PYTHONPATH"
+                         'prefix (list (getenv "GUIX_PYTHONPATH"))))))))))
       (home-page "https://www.freecadweb.org/";)
       (synopsis "Your Own 3D Parametric Modeler")
       (description



reply via email to

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