From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 WGftB2CA82JnQQEAbAwnHQ (envelope-from ) for ; Wed, 10 Aug 2022 11:54:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aJkACGCA82I1iQAA9RJhRA (envelope-from ) for ; Wed, 10 Aug 2022 11:54:40 +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 C084D100A0 for ; Wed, 10 Aug 2022 11:54:39 +0200 (CEST) Received: from localhost ([::1]:53812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLiQA-0001VI-RN for larch@yhetil.org; Wed, 10 Aug 2022 05:54:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60128) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLiPa-0001V1-MO for guix-patches@gnu.org; Wed, 10 Aug 2022 05:54:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLiPa-0007QP-DW for guix-patches@gnu.org; Wed, 10 Aug 2022 05:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLiPa-0001OQ-65 for guix-patches@gnu.org; Wed, 10 Aug 2022 05:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57106] [PATCH] gnu: wpa-supplicant-gui: Fix build. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Aug 2022 09:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57106 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57106@debbugs.gnu.org Cc: Timotej Lazar X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16601252315334 (code B ref -1); Wed, 10 Aug 2022 09:54:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Aug 2022 09:53:51 +0000 Received: from localhost ([127.0.0.1]:46134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLiPO-0001Ny-Ld for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:53:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:41120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLiPL-0001Np-Ei for submit@debbugs.gnu.org; Wed, 10 Aug 2022 05:53:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLiPI-0001Uf-OE for guix-patches@gnu.org; Wed, 10 Aug 2022 05:53:47 -0400 Received: from araneo.si ([2001:15c0:2110:3400::2]:36744) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLiPH-0007Ot-33 for guix-patches@gnu.org; Wed, 10 Aug 2022 05:53:44 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 84264637 for ; Wed, 10 Aug 2022 09:53:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20180623; bh=F+Pq2TEtEOCnJLYOXmRFb I+hqtQ=; b=xOfaV9BCIfeBFu88cEEghz0TbXBSK8O4sRh8e4qTlZbfsrwI67LeO VrjDWZbSDf9B9XIIwZZCb3y+6wFQ40P0GcVwVeW2/dO4FpCOwvMr1aGzrUmj1F+n IHmAMgbIwVqDE9I2o5o7DX4gXlar4AnCmybUSGm397++K91vG+dQUVyXCWYAkGTF Mtiikz70/8Dc+gWOMAK9J8WVXL5pZ658B55cD6k2AwvCiriy6HIpEBEIM4rA1slq tWenvAd0S6WGhM7WIUaCQI4jcuP/Z5xXXWLD0coeZg2eW2hl/yYO8r39oijE85JD Mx1rLYYaZGGXn7Y43wNZ83Ju+/qnmGUXA== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 77b4a9d4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Wed, 10 Aug 2022 09:53:34 +0000 (UTC) From: Timotej Lazar Date: Wed, 10 Aug 2022 11:48:33 +0200 Message-Id: <20220810094833.26717-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:15c0:2110:3400::2; envelope-from=timotej.lazar@araneo.si; helo=araneo.si X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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=1660125279; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=89/1u9yCZNvA5DT+W3puImGqdZtz3tHKoV8AIZdtt3Q=; b=uTWrcrQgzqEc3BFQwZlEcFXm7F5BRbRda2uDkW7/jPX58cxYyR7HV4b2I3H5EQYWK07cWT WqxLZ3OrddKl2hE5HiP7yquDU3ebl5QoJjr13Nh/Z9m3ulmR7N7ow8x3AYZ+YGVFhRoRVA Tik2h4LZpbcy4J59fyN6FhM3Ze0mHwxMi6uwzPkkB8STTh3qQb2ehKBZt6KWef7GZYU0em wMMv91b6zFWNB7QK63tfGB/jWxfo3M1/3i9ch11vhZ4pOniWhjPUZj2qwjOwAsQI5mxNLP ACMwcPUHqwyoe2oMh9G1+ijUt0DAiv98636qzPcC2ttt9EChPzci7Pa+hNSwxQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1660125279; a=rsa-sha256; cv=none; b=fW+ggiMtr9lvVonl0VZw8DIt4fysew86C42FPoddZT/lkj6WKAv6gymInk+NDexsahksQ1 4cWOePZn2RBBAAlqCzIRLPLKdAgXpJXxNQPoP0PebGJ5bUolh+rPfLXWmEKJqWcZQip19S PMIG1uXppO0T3ML0b9lsZ02z2DvZ4u2KFIJKBSXymdurLFzu1vDbJYWJC6AmFVVVM85Cyj IjwUW6epO/hVqRyKdMTKhvtBhg1sVJaxqqOcXrhQu8UXmgwoQaD0+NF6gUieF+oz+woked 6qAdYTsKPiUcZyQXheJ5ptowZHLB9oPs3MHmDuuxEvYuu5u3rX5R+QJlkVs+BA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=xOfaV9BC; 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: 6.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=araneo.si header.s=20180623 header.b=xOfaV9BC; 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: C084D100A0 X-Spam-Score: 6.91 X-Migadu-Scanner: scn1.migadu.com X-TUID: j/kRmP+0Ygmo * 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