diff mbox series

[bug#57106,v2] gnu: wpa-supplicant-gui: Fix build.

Message ID 20220811101252.1413-1-timotej.lazar@araneo.si
State Accepted
Headers show
Series [bug#57106,v2] gnu: wpa-supplicant-gui: Fix build. | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git-branch success View Git branch
cbaines/applying patch success View Laminar job
cbaines/issue success View issue

Commit Message

Timotej Lazar Aug. 11, 2022, 10:12 a.m. UTC 
* gnu/packages/admin.scm (wpa-supplicant-gui)[build-system]: Use
qt-build-system.
[phases]: Use G-exps. Drop trailing #t. Don’t wrap-program as that is done by
the build system. Set $HOME to a writable directory when converting icons to
stop Inkscape complaining.
---
Hi,

warnings/errors printed while building icons are harmless. I updated the
patch to set $HOME, which avoids most of them. The X server is also not
needed, and it seems overkill to start it just to suppress a warning.

Thanks!
Timotej

 gnu/packages/admin.scm | 48 ++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

Comments

Mathieu Othacehe Aug. 11, 2022, 3:11 p.m. UTC | #1 
>  gnu/packages/admin.scm | 48 ++++++++++++++++++------------------------
>  1 file changed, 21 insertions(+), 27 deletions(-)

Pushed, thanks!

Mathieu
diff mbox series

Patch

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 146423d068..1e6b8ccdbc 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -77,6 +77,7 @@  (define-module (gnu packages admin)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system perl)
   #:use-module (guix build-system python)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system ruby)
   #:use-module (guix build-system trivial)
   #:use-module (guix download)
@@ -2145,34 +2146,27 @@  (define-public wpa-supplicant-gui
      ;; For icons.
      (modify-inputs (package-native-inputs wpa-supplicant)
        (prepend imagemagick inkscape/stable)))
+    (build-system qt-build-system)
     (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'unpack 'chdir
-                    (lambda _
-                      (chdir "wpa_supplicant/wpa_gui-qt4")
-                      #t))
-                  (delete 'configure)
-                  (replace 'build
-                    (lambda _
-                      (invoke "qmake" "wpa_gui.pro")
-                      (invoke "make" "-j" (number->string (parallel-job-count)))
-                      (invoke "make" "-C" "icons")))
-                  (replace 'install
-                    (lambda* (#:key inputs outputs #:allow-other-keys)
-                      (let ((out (assoc-ref outputs "out"))
-                            (qt '("qtbase" "qtsvg-5")))
-                        (install-file "wpa_gui" (string-append out "/bin"))
-                        (install-file "wpa_gui.desktop"
-                                      (string-append out "/share/applications"))
-                        (copy-recursively "icons/hicolor"
-                                          (string-append out "/share/icons/hicolor"))
-                        (wrap-program (string-append out "/bin/wpa_gui")
-                          `("QT_PLUGIN_PATH" ":" prefix
-                            ,(map (lambda (label)
-                                    (string-append (assoc-ref inputs label)
-                                                   "/lib/qt5/plugins/"))
-                                  qt)))
-                        #t))))))
+     (list #:test-target "check"
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'chdir
+                 (lambda _ (chdir "wpa_supplicant/wpa_gui-qt4")))
+               (replace 'configure
+                 (lambda _ (invoke "qmake" "wpa_gui.pro")))
+               (add-after 'build 'build-icons
+                 (lambda _
+                   ;; Inkscape complains (but works) without a writable $HOME.
+                   (setenv "HOME" "/tmp")
+                   (invoke "make" "-C" "icons")))
+               (replace 'install
+                 (lambda _
+                   (install-file "wpa_gui" (string-append #$output "/bin"))
+                   (install-file "wpa_gui.desktop"
+                                 (string-append #$output "/share/applications"))
+                   (copy-recursively "icons/hicolor"
+                                     (string-append #$output "/share/icons/hicolor")))))))
     (synopsis "Graphical user interface for WPA supplicant")))
 
 (define-public hostapd