guix-commits
[Top][All Lists]
Advanced

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

branch core-updates-frozen updated: gnu: qmapshack: Remove obsolete phas


From: guix-commits
Subject: branch core-updates-frozen updated: gnu: qmapshack: Remove obsolete phase.
Date: Fri, 10 Sep 2021 04:49:47 -0400

This is an automated email from the git hooks/post-receive script.

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

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 749d0e2  gnu: qmapshack: Remove obsolete phase.
749d0e2 is described below

commit 749d0e2ee05f7e38689f193eb28764e8ca7d388c
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Fri Sep 10 10:43:05 2021 +0200

    gnu: qmapshack: Remove obsolete phase.
    
    QTWEBENGINEPROCESS_PATH is now set by the 'qt-wrap' phase.
    
    * gnu/packages/geo.scm (qmapshack)[arguments]: Remove 'wrap' phase.
---
 gnu/packages/geo.scm | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 7010d24..0e8872a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1715,22 +1715,7 @@ using the dataset of topographical information collected 
by
              ;; of QMapShack, but they are not applied by default, for
              ;; some reason...
              (invoke "patch" "-p1" "-i" "FindPROJ4.patch")
-             (invoke "patch" "-p1" "-i" "FindQuaZip5.patch")
-             #t))
-         (add-after 'install 'wrap
-           ;; The program fails to find the QtWebEngineProcess program,
-           ;; so we set QTWEBENGINEPROCESS_PATH to help it.
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
-                   (qtwebengineprocess (string-append
-                                        (assoc-ref inputs "qtwebengine")
-                                        
"/lib/qt5/libexec/QtWebEngineProcess")))
-               (for-each (lambda (program)
-                           (wrap-program program
-                             `("QTWEBENGINEPROCESS_PATH" =
-                               (,qtwebengineprocess))))
-                         (find-files bin ".*")))
-             #t)))))
+             (invoke "patch" "-p1" "-i" "FindQuaZip5.patch"))))))
     (synopsis "GPS mapping application")
     (description
      "QMapShack can be used to plan your next outdoor trip or to visualize and



reply via email to

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