guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: gcompris-qt: Switch to qt-build-system.


From: guix-commits
Subject: 02/02: gnu: gcompris-qt: Switch to qt-build-system.
Date: Tue, 10 Aug 2021 09:42:41 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 1ac96992fbdee5bfff992f067c2a7f45de99a062
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Aug 10 16:35:23 2021 +0300

    gnu: gcompris-qt: Switch to qt-build-system.
    
    * gnu/packages/education.scm (gcompris-qt)[build-system]: Switch from
    cmake-build-system to qt-build-system.
    [arguments]: Remove custom 'wrap-executable phase.
---
 gnu/packages/education.scm | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 955ab92..f0120c8 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -150,7 +150,7 @@ of categories with some of the activities available in that 
category.
              version ".tar.xz"))
        (sha256
         (base32 "1bpjwrv83rhikbycpyfpf6dbqr0xfq6amgdpqfgfph6nzr3zka7h"))))
-    (build-system cmake-build-system)
+    (build-system qt-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -162,23 +162,7 @@ of categories with some of the activities available in 
that category.
              (setenv "DISPLAY" ":1")
              ;; The test suite wants to write to /homeless-shelter
              (setenv "HOME" (getcwd))
-             #t))
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (wrap-program (string-append out "/bin/gcompris-qt")
-                 `("QT_PLUGIN_PATH" ":" prefix
-                   ,(map (lambda (label)
-                           (string-append (assoc-ref inputs label)
-                                          "/lib/qt5/plugins"))
-                         '("qtbase" "qtdeclarative" "qtmultimedia" "qtsvg")))
-                 `("QML2_IMPORT_PATH" ":" prefix
-                   ,(map (lambda (label)
-                           (string-append (assoc-ref inputs label)
-                                          "/lib/qt5/qml"))
-                         '("qtdeclarative" "qtgraphicaleffects"
-                           "qtmultimedia" "qtquickcontrols"))))
-               #t))))
+             #t)))
        #:configure-flags (list "-DQML_BOX2D_MODULE=disabled"
                                "-DBUILD_TESTING=TRUE")))
     (native-inputs



reply via email to

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