GNU bug report logs - #57106
[PATCH] gnu: wpa-supplicant-gui: Fix build.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#57106: closed ([PATCH] gnu: wpa-supplicant-gui: Fix build.)
Date: Thu, 11 Aug 2022 15:12:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Thu, 11 Aug 2022 17:11:05 +0200
with message-id <87fsi224ty.fsf_-_ <at> gnu.org>
and subject line Re: bug#57106: [PATCH] gnu: wpa-supplicant-gui: Fix build.
has caused the debbugs.gnu.org bug report #57106,
regarding [PATCH] gnu: wpa-supplicant-gui: Fix build.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
57106: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57106
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH] gnu: wpa-supplicant-gui: Fix build.
Date: Wed, 10 Aug 2022 11:48:33 +0200

* 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.
---
 gnu/packages/admin.scm | 45 +++++++++++++++++-------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 146423d068..3aa65824c8 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,24 @@ (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 _ (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
-- 
2.36.1

[Message part 3 (message/rfc822, inline)]

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 57106-done <at> debbugs.gnu.org
Subject: Re: bug#57106: [PATCH] gnu: wpa-supplicant-gui: Fix build.
Date: Thu, 11 Aug 2022 17:11:05 +0200

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

Pushed, thanks!

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.