From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iKmRNx3nVGGoFQAAgWs5BA (envelope-from ) for ; Thu, 30 Sep 2021 00:22:21 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EGQmMx3nVGGBQAAAB5/wlQ (envelope-from ) for ; Wed, 29 Sep 2021 22:22:21 +0000 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 A045113A35 for ; Thu, 30 Sep 2021 00:22:21 +0200 (CEST) Received: from localhost ([::1]:46628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhy0-0000n1-OH for larch@yhetil.org; Wed, 29 Sep 2021 18:22:20 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632954141; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=BnOMBYoP+/dZYJVHLmM8tNuSfhnP2UiBb/JMajdkVAw=; b=NUSoz9ZLHcMfTvuvBk1ZFw9+K83cINk7rhAbOqG7p0nqZP+8hwcjBhnq3hgtUeoTVj6MbG AtFZvzdqEgats1uvojLwIb6L4o2eK5AC6EedLGDz4q604EQhPSVHevK0pJNhet43oMWOoZ 3Hrew7oer5j/l8Fz4QE7U0fWOzDqgkO2reRBfOWGEbOGbomCRckZX3Ji12bKhtkDWxlUPr uL5CN5EMjy93nffsgkhoDqlcfUNxxDW4+91Yj7XZEjb8zehXd8tZjK1dvoOY888PItKfyR OwfCjBnM2gxcBL+l5FskpTpHI2Uz4XbHWg8x+tBS7ods9a3wObVxpGgwBj4TRw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632954141; a=rsa-sha256; cv=none; b=IYN46QYa1VMef+6hwJEaBByttIIaLOQXgtiMFTuI5aoeQbd5dKOXTJXp+hwMpCoeOXr6Jt aijuPlmZcRHPYGaILj7CQPOYgeOkzcj17ZEgwHjvyo5Jepu/t2R4iFly5bBNOD+XGYLx+Q GPpI/3AuN1vmNejTub0BAzn4b9PJBAtZsXHYnIUTzSeF2iAFDnSqDTo7y06lO4cspc6pL9 3+i6gWJmHNG5ig4u+kzVnIjF7fLOgFw4kVFpgK9cuQtT8mjWCx2S1R5lgMFMcnRxezfXK3 2lwniNPyxam4Go15TNWcBkpUbH+4+iK+VP/B0NrzjoRFJQz61nfAK6XJ7vpzxg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=bQgM45+j; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.70 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=bQgM45+j; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A045113A35 X-Spam-Score: 3.70 X-Migadu-Scanner: scn0.migadu.com X-TUID: TWM+p2lTJXsC * 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) -- 2.33.0