From patchwork Wed Sep 29 22:19:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33436 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 2BBF827BBE3; Wed, 29 Sep 2021 23:22:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F271A27BBE1 for ; Wed, 29 Sep 2021 23:22:20 +0100 (BST) Received: from localhost ([::1]:46628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxz-0000n1-OG for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwt-000731-G2 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwt-00028b-2U for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhws-0000l4-UM for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540322603 (code B ref 50905); Wed, 29 Sep 2021 22:21:10 +0000 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:32 +0000 Received: from localhost ([127.0.0.1]:50691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwG-0000fp-Ca for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvg-0000Y7-WB for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:58 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKwS7; Thu, 30 Sep 2021 00:19:56 +0200 From: Maxime Devos Date: Thu, 30 Sep 2021 00:19:28 +0200 Message-Id: <20210929221938.17168-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953996; bh=BnOMBYoP+/dZYJVHLmM8tNuSfhnP2UiBb/JMajdkVAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bQgM45+je+tGl953TzbGQTRSS/52c7n0DVqMkDaXq1abrIWawklSVZXuJKie++ona M3Qt3ZJsd8ba+UI8GWDC3j2ej4lW2coR2RDAlhc/sA/aAUTwDLJpKLrxehsiu9v9al 2wm3FeEQ/UreIzyR4MeiXFeZX5e+xHqL4aaPAb+kbbOitF4zNFBub96sa+otpxKgN0 VdvSEG4ugxV2rS0HKmSfxUQj3cHOPal9929O9YD+qLo62NgcsscclwPukLC+QRbtBW GOXsZ4897VmVzohuu/L5OpQ2njEQUv563GN2IPjn+tIQye2/HFSe/fr7NbYeKQShAD p4O3RVgtPZ52A== 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}: Make it unconditional. --- gnu/packages/avahi.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 20c0f2708e..797e35e7eb 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -75,21 +75,18 @@ ,@(if (%current-target-system) '("ac_cv_prog_have_pkg_config=yes") '())) - ;; TODO(core-updates): Make this unconditional. - ,@(if (%current-target-system) - `(#:modules ((srfi srfi-26) - (guix build utils) - (guix build gnu-build-system)) - #:phases - ,#~(modify-phases %standard-phases - (add-after 'patch-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (define path - `(,(dirname (search-input-file inputs "bin/sh")))) - (for-each - (cut patch-shebang <> path) - (find-files (string-append #$output "/etc/avahi"))))))) - '()))) + #:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases + ,#~(modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (define path + `(,(dirname (search-input-file inputs "bin/sh")))) + (for-each + (cut patch-shebang <> path) + (find-files (string-append #$output "/etc/avahi")))))))) (inputs `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus)