From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2LFyMA/a9GIDBgEAbAwnHQ (envelope-from ) for ; Thu, 11 Aug 2022 12:29:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id cM59Lw/a9GIsGwEAG6o9tA (envelope-from ) for ; Thu, 11 Aug 2022 12:29:35 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8D66E173B1 for ; Thu, 11 Aug 2022 12:29:34 +0200 (CEST) Received: from localhost ([::1]:45606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oM5RV-0006eo-L6 for larch@yhetil.org; Thu, 11 Aug 2022 06:29:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oM5R1-0006Hz-5C for guix-patches@gnu.org; Thu, 11 Aug 2022 06:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oM5R0-0007ma-SR for guix-patches@gnu.org; Thu, 11 Aug 2022 06:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oM5R0-0005Mp-Nv for guix-patches@gnu.org; Thu, 11 Aug 2022 06:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57106] [PATCH v2] gnu: wpa-supplicant-gui: Fix build. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Aug 2022 10:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57106@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 57106-submit@debbugs.gnu.org id=B57106.166021371120582 (code B ref 57106); Thu, 11 Aug 2022 10:29:02 +0000 Received: (at 57106) by debbugs.gnu.org; 11 Aug 2022 10:28:31 +0000 Received: from localhost ([127.0.0.1]:51757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM5QU-0005Lt-Oh for submit@debbugs.gnu.org; Thu, 11 Aug 2022 06:28:31 -0400 Received: from araneo.si ([90.157.193.204]:35734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oM5QQ-0005Li-6P for 57106@debbugs.gnu.org; Thu, 11 Aug 2022 06:28:29 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id e6b634db for <57106@debbugs.gnu.org>; Thu, 11 Aug 2022 10:28:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=20180623; bh=zWGW1w6S bsg3Z27AxphQkdpnmlg=; b=KAbY0OrPS/17d1xYeG46LdzU4K/DEbr5NR3sfKpr PMZJWlu5IJQDT8vF/6duUfGbHmQ8c5WpEt258rWf1EED8CLRne1mrExhaHD0v/4u PgLzv+yK2eisT+heThJMVdhGMbVQrEupmzdSlkmli6q8R5TLkS4ZO2WLb7Jx1Kvw f4MIVY8/BgLCZJ1E5BeF18+omA+uIlK1frkX3lg+1DYb2PNdVg+I+pAGDw4TAHhs iq5JtvQeWI8rMtIL/4R9PzH8g8fwuD9Sq5SlIZKHcAS8pFbbhxbEgkAeSjPxvLfk ybsMamc3DeVi9pjD7Dsh0yPCWTvTz/znlEwe5ZA5jCxFiQ== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 52302b32 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 11 Aug 2022 10:28:23 +0000 (UTC) From: Timotej Lazar Date: Thu, 11 Aug 2022 12:12:54 +0200 Message-Id: <20220811101252.1413-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.37.1 In-Reply-To: <87zggb2m59.fsf@gnu.org> References: <87zggb2m59.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1660213775; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=XLsbgXF4m1H5pt86r4J4k8ICdwzk1MN/yw9TBH2X6Qw=; b=I8HemfeYoG0Zbwfp62oDOPrKsXYpWh6hM/WELykGjzD7mVT/rWoU5ENpF2HiuMsGt7n5/2 wLosQyNAmTXKZLmPgq3HaX1r8gTDOW40AkscuBlZ2by50tqkEPo10vXv7tOHtpZqg6irAD fWu5kppcZVGiTBcgmn2EofdIpgQ242kip+Gigqr8Uwjxme9JpeT4ifx4S4sufqnGHiShvh 8zQqhwOlDpNFZqT1CghxtqlfNrhwq6rIWqgrcdkvwlsLhphqKI87zzYgLqRLyxgZiwuutm iThGTOlzVpU/nWiZflOGzuaqSAdY47jxwTzJJbn6llcdnnoBM7VpNOicBK1Vog== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660213775; a=rsa-sha256; cv=none; b=UzvvfSYzkRQG1HdYYlg4CNnai9iN1AD1i2U4xnU4FZg4IHrtmQPxlS+I/dnQWnDr20bFGN Fn7XIB3R44DsMaeEUrEyyDQ+eH2G+bC22IRc978fb1w+GFy/RIlJe0zpmj1UEThJga+14V L6ZpvCcSMlZhAIrzeu6ltCG8KW/ouxGrmdfPWUWiCulCZPKeQEK8ulXXjFiomkk/TVCrbX rWXUpLr0sZezgXh/nlF8CJKfV1gpUHXP+mcsjD9ZRcVcOUYq7u7BzpSFGGRWYU+afqUlyK 9h4lH3aOzQErJobNcgEXZBldh9NF2P3M6zbKFyLX3UubSsSLD8MIlcWhNB238g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=KAbY0OrP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 8.62 X-Spam: Yes Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=KAbY0OrP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=araneo.si (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 8D66E173B1 X-Spam-Score: 8.62 X-Migadu-Spam: Yes X-Migadu-Scanner: scn1.migadu.com X-TUID: HWDtoaLBve3B * 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(-) 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 -- 2.37.1