guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu: librecad: Build with qt-build-system.


From: guix-commits
Subject: 03/03: gnu: librecad: Build with qt-build-system.
Date: Mon, 4 Oct 2021 02:20:46 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 4992cd7c4e407117ff0c7befdd8e081e4ac0a1f9
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Oct 4 09:01:22 2021 +0300

    gnu: librecad: Build with qt-build-system.
    
    * gnu/packages/engineering.scm (librecad)[build-system]: Switch to
    qt-build-system.
    [arguments]: Add test-target. Remove custom 'wrap-executable phase.
---
 gnu/packages/engineering.scm | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 067c42b..b468e17 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -144,9 +144,10 @@
               (sha256
                (base32
                 "08cl4935c9vznz9qdw1zgd86rn7hl64zpfayxl07x21bhf53pn24"))))
-    (build-system gnu-build-system)
+    (build-system qt-build-system)
     (arguments
-     '(#:phases
+     '(#:test-target "check"
+       #:phases
        (modify-phases %standard-phases
          ;; Without this patch boost complains that "make_array" is not a
          ;; member of "boost::serialization".
@@ -186,19 +187,7 @@
                (install-file "unix/librecad" bin)
                (mkdir-p share)
                (copy-recursively "unix/resources" share))
-             #t))
-         ;; Ensure that icons are found at runtime
-         (add-after 'install 'wrap-executable
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (qt '("qtbase" "qtsvg")))
-               (wrap-program (string-append out "/bin/librecad")
-                 `("QT_PLUGIN_PATH" ":" prefix
-                   ,(map (lambda (label)
-                           (string-append (assoc-ref inputs label)
-                                          "/lib/qt5/plugins/"))
-                         qt)))
-               #t))))))
+             #t)))))
     (inputs
      `(("boost" ,boost)
        ("muparser" ,muparser)



reply via email to

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