From unknown Sun Jun 22 04:03:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31102] [PATCH] gnu: wpa-supplicant: Install wpa_gui. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Apr 2018 20:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 31102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 31102@debbugs.gnu.org Cc: Marius Bakke X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15232189869799 (code B ref -1); Sun, 08 Apr 2018 20:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 8 Apr 2018 20:23:06 +0000 Received: from localhost ([127.0.0.1]:42862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5Gq6-0002Xu-3L for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:23:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5Gq4-0002X9-5g for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5Gpx-0003jK-Mw for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:22:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5Gpx-0003jF-JJ for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:22:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5Gpw-0000uB-7X for guix-patches@gnu.org; Sun, 08 Apr 2018 16:22:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5Gps-0003hk-VS for guix-patches@gnu.org; Sun, 08 Apr 2018 16:22:52 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55991) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5Gps-0003hJ-OH for guix-patches@gnu.org; Sun, 08 Apr 2018 16:22:48 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E8E322098B; Sun, 8 Apr 2018 16:22:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 08 Apr 2018 16:22:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=DWjqd4v2EeJynEF8+Nwu+l5NimraQkAxILyK2KcXMUE=; b=MFgc/qW9 KlZdFMNsSnOJjjEbq/c6amRUVg4Gid46Kgb1iJeu8AY1N2MfUWKe1HyMbGFzVXPT mXENHFOLsCjjbwavukt2HNbzLhcDRGx8ZdRGWN2VdkiaoG2CgaX1E4NHJB5M8nQS /OukxTkkcoBFkG7kFcm0erK4RTA5PQ4lUr7RhhlGeOlj2nZaXMuFKLvMVkChuCc7 HgXn4Px3Bqp+HXnA+WKYUSUL3Q8Kefj6Rczda50TL0dzVWayzsg4jAN7YTXZ92IB 9h2EizF6+QM/xRntTRtNImHbxsz/ad5M1dcChZESdN6T6VjhO8O1sJxwd764tgP7 CIFfZwaDC9ZUgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=DWjqd4v2EeJynEF8+Nwu+l5NimraQ kAxILyK2KcXMUE=; b=FdpI5xNpZD1pOLdciuxeRqhs2GnyoG9WQbMWrJxCJmFGA y2IHHSFM5DoZ9S4wxcBTFprqBIwaIYvmXcEL6cbDNlePxtMBKbds4lLAd42roeG2 2AU7cNUcxTVU7sfS/RszTNtx17fymw6oygyzIBd+A8PAEqMkoaN7Ct2vLkv1688o 37EIijzzCC2L8wUIK7hYpaF1YZ50IiycnWrSm6/uqqrBDP1mhmsOG7PdYsUJulST WpQIZLhbE5uU/vfzenrL38uNS/XRkNpLrEmUEUw8pOQRPbA2POFDykUTYng2JDF8 yZg42YHZ0QCohCBSo76G46ErAzUXL4npF+XCko2GQ== X-ME-Sender: Received: from localhost (ti0089a400-2222.bb.online.no [88.89.166.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 4FAD31025B; Sun, 8 Apr 2018 16:22:46 -0400 (EDT) From: Marius Bakke Date: Sun, 8 Apr 2018 22:22:41 +0200 Message-Id: <20180408202241.10285-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) * gnu/packages/admin.scm (wpa-supplicant)[inputs]: Add QTBASE and QTSVG. [native-inputs]: Add IMAGEMAGICK and INKSCAPE. [outputs]: New field. [arguments]: Add phases 'build-wpa-gui' and 'install-wpa-gui'. --- gnu/packages/admin.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6a7bed389..8b64a531e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2017 Christopher Allan Webber -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. @@ -68,6 +68,8 @@ #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages glib) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages inkscape) #:use-module (gnu packages openldap) #:use-module (gnu packages mcrypt) #:use-module (gnu packages pkg-config) @@ -75,6 +77,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) @@ -1110,7 +1113,15 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") (package (inherit wpa-supplicant-minimal) (name "wpa-supplicant") (inputs `(("dbus" ,dbus) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ,@(package-inputs wpa-supplicant-minimal))) + (native-inputs + ;; For icons. + `(("imagemagick" ,imagemagick) + ("inkscape" ,inkscape) + ,@(package-native-inputs wpa-supplicant-minimal))) + (outputs '("out" "gui")) (arguments (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) ((#:phases phases) @@ -1124,6 +1135,32 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) (close-port port)) #t)) + (add-after 'build 'build-wpa-gui + (lambda _ + (with-directory-excursion "wpa_gui-qt4" + (invoke "qmake" "wpa_gui.pro") + (invoke "make" "-j" (number->string (parallel-job-count))) + (invoke "make" "-C" "icons")))) + (add-after 'install 'install-wpa-gui + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((gui (assoc-ref outputs "gui")) + (qt '("qtbase" "qtsvg"))) + (with-directory-excursion "wpa_gui-qt4" + (substitute* "wpa_gui.desktop" + (("Exec=wpa_gui") + (string-append "Exec=" gui "/bin/wpa_gui"))) + (install-file "wpa_gui" (string-append gui "/bin")) + (install-file "wpa_gui.desktop" + (string-append gui "/share/applications")) + (copy-recursively "icons/hicolor" + (string-append gui "/share/icons/hicolor")) + (wrap-program (string-append gui "/bin/wpa_gui") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins/")) + qt))) + #t)))) (add-after 'install-man-pages 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.17.0 From unknown Sun Jun 22 04:03:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31102] [PATCH] gnu: wpa-supplicant: Install wpa_gui. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Apr 2018 20:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 31102@debbugs.gnu.org Received: via spool by 31102-submit@debbugs.gnu.org id=B31102.1523306383536 (code B ref 31102); Mon, 09 Apr 2018 20:40:02 +0000 Received: (at 31102) by debbugs.gnu.org; 9 Apr 2018 20:39:43 +0000 Received: from localhost ([127.0.0.1]:44300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5dZn-00008a-0G for submit@debbugs.gnu.org; Mon, 09 Apr 2018 16:39:43 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:35362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5dZl-00008S-7O for 31102@debbugs.gnu.org; Mon, 09 Apr 2018 16:39:41 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9490F1243D; Mon, 9 Apr 2018 22:39:40 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zkl9Xm-tg_Vm; Mon, 9 Apr 2018 22:39:39 +0200 (CEST) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id ADB5D1240F; Mon, 9 Apr 2018 22:39:39 +0200 (CEST) From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20180408202241.10285-1-mbakke@fastmail.com> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 20 Germinal an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 09 Apr 2018 22:39:39 +0200 In-Reply-To: <20180408202241.10285-1-mbakke@fastmail.com> (Marius Bakke's message of "Sun, 8 Apr 2018 22:22:41 +0200") Message-ID: <87k1tgglmc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Marius, Marius Bakke skribis: > * gnu/packages/admin.scm (wpa-supplicant)[inputs]: Add QTBASE and QTSVG. > [native-inputs]: Add IMAGEMAGICK and INKSCAPE. > [outputs]: New field. > [arguments]: Add phases 'build-wpa-gui' and 'install-wpa-gui'. The patch LGTM, but I wonder if we should make it a separate package. Since it uses a separate output, that should be fine *if* you get substitutes. If you don=E2=80=99t, then you end up building Qt. Since wpa_supplicant is a requirement for most GuixSD configs, that could be an issue. >From the patch, it seems that the GUI is well isolated, in a separate directory, with a different build system and all. Do you think it would work to make a separate =E2=80=9Cwpa-supplicant-gui=E2=80=9D package? WDYT? Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 04:03:51 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Marius Bakke Subject: bug#31102: closed (Re: [bug#31102] [PATCH] gnu: wpa-supplicant: Install wpa_gui.) Message-ID: References: <871sf5aiqo.fsf@fastmail.com> <20180408202241.10285-1-mbakke@fastmail.com> X-Gnu-PR-Message: they-closed 31102 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 31102@debbugs.gnu.org Date: Mon, 23 Apr 2018 18:20:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1524507602-5150-1" This is a multi-part message in MIME format... ------------=_1524507602-5150-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #31102: [PATCH] gnu: wpa-supplicant: Install wpa_gui. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 31102@debbugs.gnu.org. --=20 31102: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D31102 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1524507602-5150-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 31102-done) by debbugs.gnu.org; 23 Apr 2018 18:19:15 +0000 Received: from localhost ([127.0.0.1]:37370 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAg3W-0001K1-RJ for submit@debbugs.gnu.org; Mon, 23 Apr 2018 14:19:15 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:54277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fAg3V-0001Jt-Dy for 31102-done@debbugs.gnu.org; Mon, 23 Apr 2018 14:19:14 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 147E221B8F; Mon, 23 Apr 2018 14:19:13 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 23 Apr 2018 14:19:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=SHJEryOVCZbrGP+2cTd/9sUnVnhI7WE7y6XiSV34Ngk=; b=lDC0e1rw lZBpveureE/+0JHZVbKkkHeM3jpDxQ4hkeBd1xw90E1zwWFWgLKrugYCzxAwqwjX CShOLmgLuE5RfCY7etsBzIkrnqX7qIsUaGLvswjhJQI1WK3AXNT8IIC4ujfEMAKk qY1S/X5PXPssFO//9JyDbywYFlkW78g0BDuNcRhyUYdYdLtm9xgXPhgQqamMmH1K mAXunriOYJoNMgWYYsOiKbDHnIGHXF8AO7vObpSGTub1WgDBemKRChq1eC/jMUgk TpC/CIFACaIb3Y7IgMkTbYYJ70Q6wL0makTMcK1ftRauO8QLxY9PeuHeDKpdpZm9 qeBP0kpABXQ8Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=SHJEryOVCZbrGP+2cTd/9sUnVnhI7 WE7y6XiSV34Ngk=; b=GK+8r282Ypw4IH6PmbbIcPksuDM/iTncinUgEH6y8FYum Pn8YCqgaT0f9C+DAIM+8Tw3LRn2xbg04n7TOWXMf9keqmgrR81MCTAYmlv+g33Pd ws7sHaw2jSFjpEMWF+/7q8xr4a1/zLR9wBU+AgDCl9cNIGDrPnRlilpaZVOTp5MI j5V8Q54zwLXocbnqsDPskCrkQLAgSdRJHWj4tN7YITNavDbzEaFkMwmPKPAnmhC4 l43lyNjBkV49YV0q6xEEUKY60OLKRLT3HTF/1FPHVhLIKCxP4L4HN7X+Q5CZAEAd dyYAk3RKKBrV6AKjo0IF3SlvO5wCOI0OPARm5gvpg== X-ME-Sender: Received: from localhost (228.92-221-162.customer.lyse.net [92.221.162.228]) by mail.messagingengine.com (Postfix) with ESMTPA id 96BA71025A; Mon, 23 Apr 2018 14:19:12 -0400 (EDT) From: Marius Bakke To: Ludovic =?utf-8?Q?Court=C3=A8s?= Subject: Re: [bug#31102] [PATCH] gnu: wpa-supplicant: Install wpa_gui. In-Reply-To: <87k1tgglmc.fsf@gnu.org> References: <20180408202241.10285-1-mbakke@fastmail.com> <87k1tgglmc.fsf@gnu.org> User-Agent: Notmuch/0.26.1 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Mon, 23 Apr 2018 20:19:11 +0200 Message-ID: <871sf5aiqo.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 31102-done Cc: 31102-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hi Marius, > > Marius Bakke skribis: > >> * gnu/packages/admin.scm (wpa-supplicant)[inputs]: Add QTBASE and QTSVG. >> [native-inputs]: Add IMAGEMAGICK and INKSCAPE. >> [outputs]: New field. >> [arguments]: Add phases 'build-wpa-gui' and 'install-wpa-gui'. > > The patch LGTM, but I wonder if we should make it a separate package. > > Since it uses a separate output, that should be fine *if* you get > substitutes. If you don=E2=80=99t, then you end up building Qt. > > Since wpa_supplicant is a requirement for most GuixSD configs, that > could be an issue. > > From the patch, it seems that the GUI is well isolated, in a separate > directory, with a different build system and all. Do you think it would > work to make a separate =E2=80=9Cwpa-supplicant-gui=E2=80=9D package? WD= YT? Yes, that makes sense. I pushed it as a separate package in 050e5756781cdfed2d790e15c67bc48c9aced131. I'm now using the GUI to manage all wireless connections along with a custom WPA Supplicant service that will be submitted in due time. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlreI58ACgkQoqBt8qM6 VPpjHAf6Ay4I1mxSWK2Mn34nEOSL2KtrHpG0EF8CrItXeM4MM0qT5utbGhzYsP53 YCpiQVevkjitg9OUlqO6BhtBbnbmKbY3ZyG/T/24GbrC1FXIjQytEQer7MTKIo5f gNOn+TvknS4nLnhf4RtR6hqyY4NkDOJvuVuhZwV1XrCXjby/nFOAsKPGXRSdU/k9 xkH85pUbCe6yT7p9U0MpMfTFlET5h6oF6Rw27Ldehve21bTbzvvK0ggt5GTobsIf arVzRfYS/nd9cvkLF96B3HMGpsvMB/BzM+iI8Tq/PLLK/Btbb2YhqiXOuMGW6Wag JUz5eVKXHNXP222kAqqxPlbi3ZPUeg== =SfpZ -----END PGP SIGNATURE----- --=-=-=-- ------------=_1524507602-5150-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 8 Apr 2018 20:23:06 +0000 Received: from localhost ([127.0.0.1]:42862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5Gq6-0002Xu-3L for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:23:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37045) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1f5Gq4-0002X9-5g for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5Gpx-0003jK-Mw for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:22:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5Gpx-0003jF-JJ for submit@debbugs.gnu.org; Sun, 08 Apr 2018 16:22:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5Gpw-0000uB-7X for guix-patches@gnu.org; Sun, 08 Apr 2018 16:22:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5Gps-0003hk-VS for guix-patches@gnu.org; Sun, 08 Apr 2018 16:22:52 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:55991) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f5Gps-0003hJ-OH for guix-patches@gnu.org; Sun, 08 Apr 2018 16:22:48 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id E8E322098B; Sun, 8 Apr 2018 16:22:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Sun, 08 Apr 2018 16:22:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-transfer-encoding:content-type:date:from:message-id :mime-version:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=DWjqd4v2EeJynEF8+Nwu+l5NimraQkAxILyK2KcXMUE=; b=MFgc/qW9 KlZdFMNsSnOJjjEbq/c6amRUVg4Gid46Kgb1iJeu8AY1N2MfUWKe1HyMbGFzVXPT mXENHFOLsCjjbwavukt2HNbzLhcDRGx8ZdRGWN2VdkiaoG2CgaX1E4NHJB5M8nQS /OukxTkkcoBFkG7kFcm0erK4RTA5PQ4lUr7RhhlGeOlj2nZaXMuFKLvMVkChuCc7 HgXn4Px3Bqp+HXnA+WKYUSUL3Q8Kefj6Rczda50TL0dzVWayzsg4jAN7YTXZ92IB 9h2EizF6+QM/xRntTRtNImHbxsz/ad5M1dcChZESdN6T6VjhO8O1sJxwd764tgP7 CIFfZwaDC9ZUgw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=DWjqd4v2EeJynEF8+Nwu+l5NimraQ kAxILyK2KcXMUE=; b=FdpI5xNpZD1pOLdciuxeRqhs2GnyoG9WQbMWrJxCJmFGA y2IHHSFM5DoZ9S4wxcBTFprqBIwaIYvmXcEL6cbDNlePxtMBKbds4lLAd42roeG2 2AU7cNUcxTVU7sfS/RszTNtx17fymw6oygyzIBd+A8PAEqMkoaN7Ct2vLkv1688o 37EIijzzCC2L8wUIK7hYpaF1YZ50IiycnWrSm6/uqqrBDP1mhmsOG7PdYsUJulST WpQIZLhbE5uU/vfzenrL38uNS/XRkNpLrEmUEUw8pOQRPbA2POFDykUTYng2JDF8 yZg42YHZ0QCohCBSo76G46ErAzUXL4npF+XCko2GQ== X-ME-Sender: Received: from localhost (ti0089a400-2222.bb.online.no [88.89.166.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 4FAD31025B; Sun, 8 Apr 2018 16:22:46 -0400 (EDT) From: Marius Bakke To: guix-patches@gnu.org Subject: [PATCH] gnu: wpa-supplicant: Install wpa_gui. Date: Sun, 8 Apr 2018 22:22:41 +0200 Message-Id: <20180408202241.10285-1-mbakke@fastmail.com> X-Mailer: git-send-email 2.17.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.4 (----) X-Debbugs-Envelope-To: submit Cc: Marius Bakke X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.4 (/) * gnu/packages/admin.scm (wpa-supplicant)[inputs]: Add QTBASE and QTSVG. [native-inputs]: Add IMAGEMAGICK and INKSCAPE. [outputs]: New field. [arguments]: Add phases 'build-wpa-gui' and 'install-wpa-gui'. --- gnu/packages/admin.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 6a7bed389..8b64a531e 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2017 Ben Sturmfels ;;; Copyright © 2017 Ethan R. Jones ;;; Copyright © 2017 Christopher Allan Webber -;;; Copyright © 2017 Marius Bakke +;;; Copyright © 2017, 2018 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; ;;; This file is part of GNU Guix. @@ -68,6 +68,8 @@ #:use-module (gnu packages bison) #:use-module (gnu packages flex) #:use-module (gnu packages glib) + #:use-module (gnu packages imagemagick) + #:use-module (gnu packages inkscape) #:use-module (gnu packages openldap) #:use-module (gnu packages mcrypt) #:use-module (gnu packages pkg-config) @@ -75,6 +77,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages qt) #:use-module (gnu packages terminals) #:use-module (gnu packages texinfo) #:use-module (gnu packages groff) @@ -1110,7 +1113,15 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") (package (inherit wpa-supplicant-minimal) (name "wpa-supplicant") (inputs `(("dbus" ,dbus) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ,@(package-inputs wpa-supplicant-minimal))) + (native-inputs + ;; For icons. + `(("imagemagick" ,imagemagick) + ("inkscape" ,inkscape) + ,@(package-native-inputs wpa-supplicant-minimal))) + (outputs '("out" "gui")) (arguments (substitute-keyword-arguments (package-arguments wpa-supplicant-minimal) ((#:phases phases) @@ -1124,6 +1135,32 @@ This package provides the 'wpa_supplicant' daemon and the 'wpa_cli' command.") CONFIG_CTRL_IFACE_DBUS_INTRO=y\n" port) (close-port port)) #t)) + (add-after 'build 'build-wpa-gui + (lambda _ + (with-directory-excursion "wpa_gui-qt4" + (invoke "qmake" "wpa_gui.pro") + (invoke "make" "-j" (number->string (parallel-job-count))) + (invoke "make" "-C" "icons")))) + (add-after 'install 'install-wpa-gui + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((gui (assoc-ref outputs "gui")) + (qt '("qtbase" "qtsvg"))) + (with-directory-excursion "wpa_gui-qt4" + (substitute* "wpa_gui.desktop" + (("Exec=wpa_gui") + (string-append "Exec=" gui "/bin/wpa_gui"))) + (install-file "wpa_gui" (string-append gui "/bin")) + (install-file "wpa_gui.desktop" + (string-append gui "/share/applications")) + (copy-recursively "icons/hicolor" + (string-append gui "/share/icons/hicolor")) + (wrap-program (string-append gui "/bin/wpa_gui") + `("QT_PLUGIN_PATH" ":" prefix + ,(map (lambda (label) + (string-append (assoc-ref inputs label) + "/lib/qt5/plugins/")) + qt))) + #t)))) (add-after 'install-man-pages 'install-dbus-conf (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.17.0 ------------=_1524507602-5150-1-- From unknown Sun Jun 22 04:03:51 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#31102] [PATCH] gnu: wpa-supplicant: Install wpa_gui. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Apr 2018 22:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 31102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Marius Bakke Cc: 31102-done@debbugs.gnu.org Received: via spool by 31102-done@debbugs.gnu.org id=D31102.15246943055350 (code D ref 31102); Wed, 25 Apr 2018 22:12:01 +0000 Received: (at 31102-done) by debbugs.gnu.org; 25 Apr 2018 22:11:45 +0000 Received: from localhost ([127.0.0.1]:39645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBSdd-0001OE-4b for submit@debbugs.gnu.org; Wed, 25 Apr 2018 18:11:45 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:53136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fBSdb-0001O4-KF for 31102-done@debbugs.gnu.org; Wed, 25 Apr 2018 18:11:43 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9EDCA1282C; Thu, 26 Apr 2018 00:11:42 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5b5ojTzFaV9U; Thu, 26 Apr 2018 00:11:41 +0200 (CEST) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 33B7511629; Thu, 26 Apr 2018 00:11:41 +0200 (CEST) From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) In-Reply-To: <871sf5aiqo.fsf@fastmail.com> (Marius Bakke's message of "Mon, 23 Apr 2018 20:19:11 +0200") References: <20180408202241.10285-1-mbakke@fastmail.com> <87k1tgglmc.fsf@gnu.org> <871sf5aiqo.fsf@fastmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 5 =?UTF-8?Q?Flor=C3=A9al?= an 226 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Thu, 26 Apr 2018 00:11:40 +0200 Message-ID: <87in8fndgj.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Howdy Marius, Marius Bakke skribis: > Ludovic Court=C3=A8s writes: > >> Hi Marius, >> >> Marius Bakke skribis: >> >>> * gnu/packages/admin.scm (wpa-supplicant)[inputs]: Add QTBASE and QTSVG. >>> [native-inputs]: Add IMAGEMAGICK and INKSCAPE. >>> [outputs]: New field. >>> [arguments]: Add phases 'build-wpa-gui' and 'install-wpa-gui'. >> >> The patch LGTM, but I wonder if we should make it a separate package. >> >> Since it uses a separate output, that should be fine *if* you get >> substitutes. If you don=E2=80=99t, then you end up building Qt. >> >> Since wpa_supplicant is a requirement for most GuixSD configs, that >> could be an issue. >> >> From the patch, it seems that the GUI is well isolated, in a separate >> directory, with a different build system and all. Do you think it would >> work to make a separate =E2=80=9Cwpa-supplicant-gui=E2=80=9D package? W= DYT? > > Yes, that makes sense. I pushed it as a separate package in > 050e5756781cdfed2d790e15c67bc48c9aced131. Awesome, thank you! Ludo=E2=80=99.