From patchwork Sat Jan 6 06:04:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 58421 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 299B727BBEC; Sat, 6 Jan 2024 06:06:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 565AD27BBE2 for ; Sat, 6 Jan 2024 06:06:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rLzoo-0004Lr-Go; Sat, 06 Jan 2024 01:06:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rLzok-0004JM-PT for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLzok-0002YW-H4 for guix-patches@gnu.org; Sat, 06 Jan 2024 01:05:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rLzop-00057a-6Z; Sat, 06 Jan 2024 01:06:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68276] [PATCH 3/4] gnu: iwd: Use gexps. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: hako@ultrarare.space, guix-patches@gnu.org Resent-Date: Sat, 06 Jan 2024 06:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68276 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68276@debbugs.gnu.org Cc: Hilton Chain , Hilton Chain X-Debbugs-Original-Xcc: Hilton Chain Received: via spool by 68276-submit@debbugs.gnu.org id=B68276.170452113919622 (code B ref 68276); Sat, 06 Jan 2024 06:06:03 +0000 Received: (at 68276) by debbugs.gnu.org; 6 Jan 2024 06:05:39 +0000 Received: from localhost ([127.0.0.1]:58414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoQ-00056P-S4 for submit@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:39 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:41586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rLzoO-00056F-1R for 68276@debbugs.gnu.org; Sat, 06 Jan 2024 01:05:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1704521099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H5YUwkMm/5Kg+brx9QLh8r7WB3GJMzyb0fnHtE7PtZ4=; b=wjqvEZZzU9OHqtuji2Ayw6RNgrLiUK9jmST7+JKwG4zARmTAPbUiuRfe8qpfOsQAuD5hOq zjd4xkO4iyysPEggyZPLqU+O+N66ZAGLl4UOLd/4ETsiyN1Acg4tJZ8U/JXk17VWoscu/5 Hzy2mJZ9VHa6PVD0t9XYZi/1Wcj5952DoTt1HVwcNb/U6TM54g1SHfsfAWSzfsfWlz017r rbhyMG6jZqwnu6YwK+co+1ixDWGKmGicX8LaVqxnXDcRVf9VgJCkONr0V5SlxeU4Afgb48 FKTqd/DQsN2ajBa7Uf2aizQswsj778jHQ4nXhnQi6Y1cp8dbYbOIRgb3Axb1iQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Sat, 6 Jan 2024 14:04:48 +0800 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (iwd): Use gexps. Change-Id: Ie4a6394c9c7977291f56990eb1a535ba673d04ee --- gnu/packages/networking.scm | 62 ++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fda6775d71..20674de76d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3959,37 +3959,37 @@ (define-public iwd python-docutils openssl)) (arguments - `(#:configure-flags - ,#~(list "--disable-systemd-service" - "--enable-external-ell" - "--enable-hwsim" - "--enable-tools" - "--enable-wired" - "--localstatedir=/var" - (string-append "--with-dbus-datadir=" #$output "/share/") - (string-append "--with-dbus-busdir=" - #$output "/share/dbus-1/system-services")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-ell-header-files - ;; Copy into the source tree two of ell's private header files that - ;; it shares with iwd, as is required to build with the - ;; "--enable-external-ell" configure option. - ;; See the definition of "ell_shared" in iwd's Makefile.am. - (lambda* (#:key inputs #:allow-other-keys) - (let ((ell-header-dir (search-input-directory inputs "/ell")) - (target-dir "ell")) - (mkdir target-dir) - (for-each - (lambda (file-name) - (copy-file (string-append ell-header-dir "/" file-name) - (string-append target-dir "/" file-name))) - '("asn1-private.h" "useful.h"))))) - (add-after 'configure 'patch-Makefile - (lambda _ - (substitute* "Makefile" - ;; Don't try to 'mkdir /var'. - (("\\$\\(MKDIR_P\\) -m 700") "true"))))))) + (list #:configure-flags + #~(list "--disable-systemd-service" + "--enable-external-ell" + "--enable-hwsim" + "--enable-tools" + "--enable-wired" + "--localstatedir=/var" + (string-append "--with-dbus-datadir=" #$output "/share/") + (string-append "--with-dbus-busdir=" + #$output "/share/dbus-1/system-services")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-ell-header-files + ;; Copy into the source tree two of ell's private header files + ;; that it shares with iwd, as is required to build with the + ;; "--enable-external-ell" configure option. See the + ;; definition of "ell_shared" in iwd's Makefile.am. + (lambda* (#:key inputs #:allow-other-keys) + (let ((ell-header-dir (search-input-directory inputs "/ell")) + (target-dir "ell")) + (mkdir target-dir) + (for-each + (lambda (file-name) + (copy-file (string-append ell-header-dir "/" file-name) + (string-append target-dir "/" file-name))) + '("asn1-private.h" "useful.h"))))) + (add-after 'configure 'patch-Makefile + (lambda _ + (substitute* "Makefile" + ;; Don't try to 'mkdir /var'. + (("\\$\\(MKDIR_P\\) -m 700") "true"))))))) (home-page "https://iwd.wiki.kernel.org/") (synopsis "iNet Wireless Daemon") (description "iwd is a wireless daemon for Linux that aims to replace WPA