bug#57106: closed ([PATCH] gnu: wpa-supplicant-gui: Fix build.)

[GNU bug Tracking System]

Your message dated Thu, 11 Aug 2022 17:11:05 +0200
with message-id <87fsi224ty.fsf_-_@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@gnu.org.)


-- 
57106: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57106
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#57106: [PATCH] gnu: wpa-supplicant-gui: Fix build.
>
>
>
>
> Date: 
>
> Thu, 11 Aug 2022 17:11:05 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux)
>
>
>
>
> >  gnu/packages/admin.scm | 48 ++++++++++++++++++------------------------
> >  1 file changed, 21 insertions(+), 27 deletions(-)
>
> Pushed, thanks!
>
> Mathieu
>
>
> --- End Message ---