ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 12:39:36 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: wpa-supplicant-gui: Fix build.

Browse source 
* 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.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
Timotej Lazar 2022-08-11 12:12:54 +02:00 committed by Mathieu Othacehe
parent a817064947
commit cbbb5aa9d4
No known key found for this signature in database
GPG key ID: 8354763531769CA6
1 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/admin.scm
View file

@ -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,30 @@ (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