From b94d83ed7b9ed7fe009e6aa4920970a8ebfa4276 Mon Sep 17 00:00:00 2001
From: Ivan Vilata-i-Balaguer <address@hidden>
Date: Sun, 15 Dec 2019 20:12:34 -0500
Subject: [PATCH 2/2] gnu: mumble: Use qt-build-system.

* gnu/packages/telephony.scm: Add import of (guix build-system qt).
* gnu/packages/telephony.scm (mumble): Use qt-build-system.
  <phases>: Base on phases from qt-build-system. {wrap-executable}:
  Remove.
---
 gnu/packages/telephony.scm | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 53911f4a94..e0168d2345 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -79,7 +79,8 @@
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
-  #:use-module (guix build-system gnu))
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system qt))
 
 (define-public commoncpp
   (package
@@ -410,11 +411,11 @@ address of one of the participants.")
                                                       "3rdparty/xinputcheck-build" ; for win32
                                                       "3rdparty/xinputcheck-src"))
                   #t))))
-    (build-system gnu-build-system)
+    (build-system qt-build-system)
     (arguments
      `(#:tests? #f  ; no "check" target
        #:phases
-       (modify-phases %standard-phases
+       (modify-phases (@ (guix build qt-build-system) %standard-phases)
          (replace 'configure
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (invoke "qmake" "main.pro" "QMAKE_LRELEASE=lrelease"
@@ -475,19 +476,7 @@ address of one of the participants.")
                (for-each (lambda (file) (install-file file lib))
                          (find-files "." "\\.so\\."))
                (for-each (lambda (file) (install-file file lib))
-                         (find-files "release/plugins" "\\.so$")))))
-         (add-after 'install 'wrap-executable
-           ;; Add path to plugins for SVG support (otherwise many icons are not shown).
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (for-each (lambda (program)
-                           (wrap-program (string-append out "/bin/" program)
-                             `("QT_PLUGIN_PATH" ":" prefix
-                               ,(map (lambda (label)
-                                       (string-append (assoc-ref inputs label)
-                                                      "/lib/qt5/plugins"))
-                                     '("qtbase" "qtsvg")))))
-                         '("mumble" "mumble-overlay"))))))))
+                         (find-files "release/plugins" "\\.so$"))))))))
     (inputs
      `(("avahi" ,avahi)
        ("boost" ,boost)
-- 
2.24.0