From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sKSqLYsUCGFbBAEAgWs5BA (envelope-from ) for ; Mon, 02 Aug 2021 17:51:39 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id YKtNKYsUCGGySAAAbx9fmQ (envelope-from ) for ; Mon, 02 Aug 2021 15:51:39 +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 6593F2D525 for ; Mon, 2 Aug 2021 17:51:39 +0200 (CEST) Received: from localhost ([::1]:45010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAaE6-0003Zb-GY for larch@yhetil.org; Mon, 02 Aug 2021 11:51:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAaDX-0002MS-MQ for guix-patches@gnu.org; Mon, 02 Aug 2021 11:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mAaDX-0005Z1-Eo for guix-patches@gnu.org; Mon, 02 Aug 2021 11:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mAaDX-00051k-Eg for guix-patches@gnu.org; Mon, 02 Aug 2021 11:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49828] [PATCH 05/20] build-system: minetest: Don't retain references to "bash-minimal". Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 02 Aug 2021 15:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49828 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49828@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49828-submit@debbugs.gnu.org id=B49828.162791943319155 (code B ref 49828); Mon, 02 Aug 2021 15:51:03 +0000 Received: (at 49828) by debbugs.gnu.org; 2 Aug 2021 15:50:33 +0000 Received: from localhost ([127.0.0.1]:39058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAaD2-0004ym-Ry for submit@debbugs.gnu.org; Mon, 02 Aug 2021 11:50:33 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:51262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mAaCw-0004wi-H7 for 49828@debbugs.gnu.org; Mon, 02 Aug 2021 11:50:27 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id cfqN2500C0mfAB401fqRxK; Mon, 02 Aug 2021 17:50:25 +0200 From: Maxime Devos Date: Mon, 2 Aug 2021 17:50:04 +0200 Message-Id: <20210802155019.6122-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802155019.6122-1-maximedevos@telenet.be> References: <20210802155019.6122-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=1627919425; bh=IPRc9l0xVX+wIwAK2Oy3jaO3h08kgu3DIMoEsGGqpOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=I46LMlakFaZD8/thlrnY/DSfntNd8i5xmlzaV+CYQJ9o0w7UyNTolGPz3gjfB/3Hc pWg+BF+IZg9u6IFKT9t8W/3Wneh3ZeQ+fMawCqM2TNZ3T1a86OLblYILWyt+ZX1N+G 7IPsnTZVvujrmELkCR/8vu5YaGAFViBDMFDcclVcKHZKW3Aj18N9pITcBSVGuAqKra JA7lrFIrsEIoP5gfB+vfakFbjjrY4nCv34OXOxDID7rfl2amJpjzeM2q0SzZ4frLGk dVyVtHfHWGJYlAli4yyAoBPtuX+uz7jBSMkX29O8SBTawlyfvOdE9Xgm8WDmnwFsbW sBoQ7vkyfFu7g== 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=1627919499; 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=IPRc9l0xVX+wIwAK2Oy3jaO3h08kgu3DIMoEsGGqpOI=; b=E5g7WoaB4pM/cYzWNnZe0C5+y5c5va7h8MpdH+/YEaa+ABLWV/4WtB5tGYNoj7vnU5O/R0 5WJ34q8fy5gB+nwsmVPh8jeVLR0sJWc9VI2l3FJ2+OpY5nqK8zSDIJQwSig9BbW4hDNz6H foSdz918RY+l7WB5plqLomNQjis0SXuhoamlnmK5NqHPN5h8dEomUBbPrJrfTYS6onp8FT bNXK/dm2vSfvkuTVhaVIWslS6YJYqS+M/sB3+MDA8wzZ5rQ5pDbfAQV992yPuiItjl/JFJ fbYY2ldrxUgMI3w+BVEwI00BanJ7ElUFIF79M6WMi+vhHhu5ZDzjEJAdcz1szQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627919499; a=rsa-sha256; cv=none; b=twYGbPx/yeJZ3yo320M8tY/suLRmINQLQ7PUU/s7e0VovQAEOOUIjcz7XVGeZWRdew+U6s f5ax1p25aXtTKlLsXeQePPb//JRrZvutuuZSFW4qWwV6YlOqM7gntJ/1sut1Roh3RSj3mB z9vx9mDNRP/ddD6m3SZNvZdASQxqnOPmwfrCfkbpDDxAuEoYRD/5vqnUWN900WdvpFwOvP 0Rkyjw3XD9B1gnVuQE996xYRljlDnAyFMjkI2oGlfCdSuM9Vx9hLwgBsHlsduHTSrrqIED CkPdKWXZMVphyLTNfLP1ivxJ8+4wALMN2h0esFM7PAWi7pxnouHDDSqMDBX4Zg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=I46LMlak; 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.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=I46LMlak; 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: 6593F2D525 X-Spam-Score: 3.68 X-Migadu-Scanner: scn0.migadu.com X-TUID: N9PY5IjV28EU * guix/build-system/minetest.scm (%standard-phases): New variable. Delete "patch-source-shebangs" phase. (lower-mod): Set #:phases to value of new variable. --- guix/build-system/minetest.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/build-system/minetest.scm b/guix/build-system/minetest.scm index 29866ced6d..993c5631eb 100644 --- a/guix/build-system/minetest.scm +++ b/guix/build-system/minetest.scm @@ -35,6 +35,14 @@ (substring package-name 9) package-name)) +(define %standard-phases + ;; The source code sometimes contains shell scripts which are used for + ;; development but not at run time (e.g. listnodes.sh in + ;; minetest-homedecor-modpack). Don't make them retain a reference + ;; to bash-minimal. + '(modify-phases (@ (guix build copy-build-system) %standard-phases) + (delete 'patch-source-shebangs))) + (define (lower-mod name . arguments) (define lower (build-system-lower copy-build-system)) (apply lower @@ -42,6 +50,7 @@ #:install-plan `'(("." ,(string-append "share/minetest/mods/" (guix-name->mod-name name)))) + #:phases %standard-phases arguments)) (define minetest-mod-build-system -- 2.32.0