From patchwork Sun Jan 30 23:08:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Hamelink X-Patchwork-Id: 36903 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 6F0E027BBEA; Sun, 30 Jan 2022 23:18:18 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 02D1227BBE9 for ; Sun, 30 Jan 2022 23:18:18 +0000 (GMT) Received: from localhost ([::1]:50912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEJSb-0002X7-2c for patchwork@mira.cbaines.net; Sun, 30 Jan 2022 18:18:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEJSM-0002Qh-ND for guix-patches@gnu.org; Sun, 30 Jan 2022 18:18:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEJSM-0001jt-EP for guix-patches@gnu.org; Sun, 30 Jan 2022 18:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEJSM-0000P1-0r for guix-patches@gnu.org; Sun, 30 Jan 2022 18:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53643] [PATCH] gnu: elixir: Use previous method for detecting sh Resent-From: John Hamelink Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Jan 2022 23:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53643 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: 53643@debbugs.gnu.org Received: via spool by 53643-submit@debbugs.gnu.org id=B53643.1643584638381 (code B ref 53643); Sun, 30 Jan 2022 23:18:01 +0000 Received: (at 53643) by debbugs.gnu.org; 30 Jan 2022 23:17:18 +0000 Received: from localhost ([127.0.0.1]:37998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEJRe-00005X-6e for submit@debbugs.gnu.org; Sun, 30 Jan 2022 18:17:18 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:54085) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEJRb-0008QL-3d for 53643@debbugs.gnu.org; Sun, 30 Jan 2022 18:17:16 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 548B43200E79; Sun, 30 Jan 2022 18:17:08 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sun, 30 Jan 2022 18:17:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=johnhame.link; h=cc:cc:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; bh=wV/KnVvLyInAWJt+G4CdZ+JgsRokVH RJ0zrZYlNKDr8=; b=wOP5aWPpuUf4riMZOJQg3g/YY5Dib/ubegZNiShZ8uWLor NTAcMedL0c81klvF/t6DhLoa88FTN+OdDYQeI9PCq3SBx5VaEJirKRhj/C4x56dh PQfNupy65Mfi09v/FJIPo4FUkNPw25NkJ00I31A5TlBctn1ApXGrW8n//fmXZJv3 6qA7QkAdA0Dzh3lOJ72+yhnfgJRLsFeLOLcdwpgATcRwrXrhyd2pKU8DMcm+1NJg PeT5L4lH7JZDGEh3t+Wrrfl5whzDiIDIYDet0CylKVR6Ma/r2Acqsfx1XsOMKoqI TWl2fjHHjbzdXpTRGkPoOqe4KLzDmvGMOo9Ey30w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=wV/KnVvLyInAWJt+G 4CdZ+JgsRokVHRJ0zrZYlNKDr8=; b=jTXR5m7V4cn+RINPXzsLLOg65FEaSJuNx VU8wgpk/g1oEU1ACUjiDsbIqW/YZLsEjhJ+ydQ6SDx+roy0oGFygA8gEU7kZY0k7 JiK1bmSVoGLFr7GmbA3WZQMDjUKK5fQJqNT3/4isee5OHbwOee11nB4w0ycufOpJ tj8Ll5lsrz1wmvzsKRdRfTgN05+kbo7Ul0i9z7Lhn1k5itOv0+zJvx3ELc09LMca JNRKTrs9h6n6o0kOyBoqyanN4shuJmSAuxpwSuesYUhLGhEc4ivXUq04EZaF371t /dxntFcKjJkgDmHiu4lW2ErdErNvDZPHlzZF98RSgz7u73GgJz9GA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrgedtgddtkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffuffhffggjkfggtgesghdtreertdertdenucfhrhhomheplfhohhhnucfj rghmvghlihhnkhcuoehmvgesjhhohhhnhhgrmhgvrdhlihhnkheqnecuggftrfgrthhtvg hrnhepudekgfetvdegffeileeigfeghfettdegffelteduheevieffleeigeevuddvheek necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgvse hjohhhnhhhrghmvgdrlhhinhhk X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 30 Jan 2022 18:17:07 -0500 (EST) From: John Hamelink Date: Sun, 30 Jan 2022 23:08:56 +0000 References: <878ruwexe3.fsf@johnhame.link> <1cfa84a32e79af82e0c57bfe11e4601a1db76880.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 28.0.50 In-reply-to: <1cfa84a32e79af82e0c57bfe11e4601a1db76880.camel@telenet.be> Message-ID: <87k0eg4xvy.fsf@johnhame.link> MIME-Version: 1.0 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 Hi Maxime, Thanks for looking over my submission. I agree on all points. > - (string-append "#!" (search-input-file inputs "sh")))) > + (string-append "#!" (search-input-file inputs "bin/sh")))) The rest of the file's usage of search-input-file involves a forward-slash before bin. I tried including the forward-slash and leaving it out in all relevant places, and it doesn't seem like it makes a difference - I didn't try to cross-compile, though. Regardless, I made a patch for each option. --- gnu/packages/elixir.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 3fb74a56a5..fae8279e5c 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -68,7 +68,7 @@ (define-public elixir (substitute* '("lib/mix/lib/mix/release.ex" "lib/mix/lib/mix/tasks/release.init.ex") (("#!/bin/sh") - (string-append "#!" (search-input-file inputs "sh")))) + (string-append "#!" (search-input-file inputs "/bin/sh")))) (substitute* "bin/elixir" (("^ERTS_BIN=$") (string-append -- 2.35.1 --- gnu/packages/elixir.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index 3fb74a56a5..2fee929d6a 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -64,11 +64,11 @@ (define-public elixir "lib/mix/lib/mix/scm/git.ex") (("(cmd\\(['\"])git" _ prefix) (string-append prefix - (search-input-file inputs "/bin/git")))) + (search-input-file inputs "bin/git")))) (substitute* '("lib/mix/lib/mix/release.ex" "lib/mix/lib/mix/tasks/release.init.ex") (("#!/bin/sh") - (string-append "#!" (search-input-file inputs "sh")))) + (string-append "#!" (search-input-file inputs "bin/sh")))) (substitute* "bin/elixir" (("^ERTS_BIN=$") (string-append @@ -79,7 +79,7 @@ (define-public elixir ;; are not in release mode and can point to the actual erl ;; binary in Guix store. "\nif [ -z \"$ERTS_BIN\" ]; then ERTS_BIN=" - (string-drop-right (search-input-file inputs "/bin/erl") 3) + (string-drop-right (search-input-file inputs "bin/erl") 3) "; fi\n"))) (substitute* "bin/mix" (("#!/usr/bin/env elixir")