From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id KKwTO+9mK2FacwAAgWs5BA (envelope-from ) for ; Sun, 29 Aug 2021 12:52:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 0D7WNu9mK2H2VQAA1q6Kng (envelope-from ) for ; Sun, 29 Aug 2021 10:52:31 +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 A2DD8FABC for ; Sun, 29 Aug 2021 12:52:31 +0200 (CEST) Received: from localhost ([::1]:41104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKIQQ-0007mr-M5 for larch@yhetil.org; Sun, 29 Aug 2021 06:52:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKILE-000670-JT for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKILE-0001df-5f for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKILE-0000Gg-1x for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v2 09/33] gnu: node: Patch /usr/bin/env in node-gyp. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Aug 2021 10:47:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49946@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.1630234020856 (code B ref 49946); Sun, 29 Aug 2021 10:47:08 +0000 Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:00 +0000 Received: from localhost ([127.0.0.1]:55568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKIL6-0000Dd-1D for submit@debbugs.gnu.org; Sun, 29 Aug 2021 06:47:00 -0400 Received: from mout.gmx.net ([212.227.17.22]:48379) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKIKj-0000AF-6X for 49946@debbugs.gnu.org; Sun, 29 Aug 2021 06:46:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630233991; bh=42b5qx9L9D1T6tyD+X99xNIoTWXxU0Oz3k8IgJOnBB0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=EjJEdAyKIJHSGVk7zLjPuOMNfoiAS4g3TFl4sMJActaIDF2YishrUGAwZ3acU6Tlr FLBGyjCHygpE4G+MPb7CmPIVBDXIS6ZSF7G6g23tNu0272ysA52lh64CiWCGv4Y6hi yLhPaaMwwfiIzSLLFsQHbvtZltFdpnnQh6RLvAe0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N8XPt-1n6T141HRh-014Vyh; Sun, 29 Aug 2021 12:46:31 +0200 From: Pierre Langlois Date: Sun, 29 Aug 2021 11:45:44 +0100 Message-Id: <20210829104608.3103-9-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210829104608.3103-1-pierre.langlois@gmx.com> References: <87czpwzg9e.fsf@gmx.com> <20210829104608.3103-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:YhwC86UAfuAgWFyDgFVCwdXzLZH0VoDhaF04W2M42AjFnRaV8Xb jNnqb76RWHmrOnwmJbJh4lLglAoJUqfFqm9wZKByEGtV+bKQRXzTnQTC4suyAPCkU9WgqBH 2HKgqiDmOQ5Etx+QezazaZEagKQVAraDcl0ioB6qdPONcNXhODU9yeZBmtZHS61vY1vDl44 8sICuzPVReWagrOl3Wlmg== X-UI-Out-Filterresults: notjunk:1;V03:K0:XUkp05xqsNQ=:wM6qjRDEhbQE3yfCXYHQ4o KO8Fv7jc0PdwjD8n8QMEgJ0VDqAG6lx8R5mgQ4czD4/Og+AlU6WEYCE1lyVel0zDT+W3nLsmF u52LBMbuSwhUbmTQhUOpbUYWzkvw85hswRjnXmpTZgpsMPtMX8hp04+BMV0TA3/KlsK7VP9PP 5QBM+8eLYleeY02uSHYg9xxyL+MeIlu5g7X5mGjBiUtYXp96dtdSN9Oq+HgU6cHtcva3nbqNi Osb5UAnNx3VSGTbRh8ArNVE9CXxcPkJHjhbmoSBVRTPGMQWzy0CmtfEEJr4dfLX1dORcmm7yU uaWPJ04CkpfCL8zuAU0M5KXUDPV1lkrXFMiU/NqpDhaaFjtA+VwTfbXo9LU95mc5dwYirr3+I 9uP6w56DOg+W1OgcrCp6PwrnBQDqkG/hvJO54AOwcxgfkWJHRvmXP72xzvtYl3LImmJa7wKYk gH9TX2ac3+5WEjaB1tCvxdmYhRVHkkHbbqHHAvmVB0XYBub56FmXG5InModxZZOCdAYiHbNd5 9FTMLufhwz2na8YnihzVU79VxMbK8Y6TgzTem9DF37zXGYCN588ITEb6f8snPXw1Ng9IgMc0I m2oNhtIB9/VotFJFTFTsBoSFtHUjAttr0RftlKn6V75yrsee02KjM2abDPpxQ6YT3/1ZjouuX ooNj/qNadSScC/XczzVxN25aubuoc8UZdgaAGRZVnhKMeSy4j9Wuft8X9duKduyL+kRy6dHPQ atgPHs1zIZEqfxY5ZPyn+yypilS9alIsJzZGl0LVPg5jj+BiFxtZMYQBf+v0uZ2/ZVjmfxye0 K7aKrfJyTd7fygAJvQQILWdQ1W64XlfaIUw2F4MDVrCnaP4M6bZMLsWUuUjDkjx5ScvtNHbUt Rvccy7nKKui6ltpNg2F+rvUhTn+dfeffZiVj2KdLmjyFLnFUTp6rItz0vfKhI2uz16opw20Dm oXZ8iI8NMwzb9WrRO968nMNzXGMJLtsteyq0MBas6kqAmp76aJGr1GnvwKvmu4eebXXbd3FSq Ar2yVIfiIjSjHaOEOUzijHUcMNic7NLmqkryPuADF+6cnVYwGSPyjZ4AOwEHciPRVV4yjDLki qaeHemUVQjfhcJHXVBDBBuVBep3f2rj7kjJm431GUxyEEtvCfkhfpX1IA== 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=1630234351; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=kuCGVqNfHs6PsJEPYnC7r1wSKXaJWNHXYjZQkOhVCyo=; b=pZujhWzg7bbpaWO6VjHH09vdMjWnBhnHFAmxtJn+qI1J7Y//U4mBn55/2lN9f420AP7XNE /146iJFDDCwH7dw8Jgext+HLSjWISysW2brJHeDMKzHbcu8NhOgl5M/HkF1Lm5vGzCLsm3 xHqMmJHoM+C/7nYZuDhhlGwo8p+B93xOPtyA63/GExFQxIYxMEG4pCX1yRqePvB6TZPEtb P1LfG6uQUx353XSYMf8ivKSIv6MRx9HW/1lXEprg7ESiGh0EZWrVKOvWMjnii+Kc6E3akx jrXoG/kamqkgFBTh5Rd4P9BHTYJPj1z2MxBDwHXkTEXbhJEekaGjleG3PK/HOg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630234351; a=rsa-sha256; cv=none; b=Re2qFtJc6fSwxEc75MsvOTkGHOek0n0eXPzqj1MTNgMclf1u1GJ66gJK3JlZHQ8iF/WvP9 6EfyUiYlCVt5UljuA4VIip5th8HuoxQDkAmWdxo8yfQWNW/9tv2CkEHpQjMywg4HwAlaFQ 6GCZcGAN9ozi7KHCCD+JyyHgFAkb/z2j8xFP59LgM7xmmoxS6cf2DJO1F4noFacdZ8dEdd Sa/liPXm+gGK4IedIQ0RZjg0TU+JmORRzBSOAoojJP4cL/YlWwXdCa1fpkrfJWXsIDFwis 01i2umb2kSDetfPMhNH4LgGSj1w34hmQeThr+rrWLJn+m+FrU1LLGoX55EXSbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=EjJEdAyK; 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: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmx.net header.s=badeba3b8450 header.b=EjJEdAyK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmx.com (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: A2DD8FABC X-Spam-Score: -0.33 X-Migadu-Scanner: scn0.migadu.com X-TUID: ncuvMcEmNxqj * gnu/packages/node.scm (node)[arguments]: Fix /usr/bin/env shebang in node-gyp.js. (node-lts)[arguments]: Ditto. =2D-- gnu/packages/node.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 36c45e9c7a..530c04bc68 100644 =2D-- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -6,7 +6,7 @@ ;;; Copyright =C2=A9 2017 Mike Gerwitz ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018, 2019, 2020, 2021 Marius Bakke -;;; Copyright =C2=A9 2020 Pierre Langlois +;;; Copyright =C2=A9 2020, 2021 Pierre Langlois ;;; Copyright =C2=A9 2020 Ricardo Wurmus ;;; Copyright =C2=A9 2021 Simon Tournier ;;; @@ -120,6 +120,11 @@ (("'/usr/bin/env'") (string-append "'" (which "env") "'"))) + ;; Fix /usr/bin/env shebang in node-gyp. + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.js= " + (("#!/usr/bin/env") + (string-append "#!" (assoc-ref inputs "coreutils") "/bin/= env"))) + ;; FIXME: These tests fail in the build container, but they = don't ;; seem to be indicative of real problems in practice. (for-each delete-file @@ -661,6 +666,11 @@ source files.") (("'/usr/bin/env'") (string-append "'" (which "env") "'"))) + ;; Fix /usr/bin/env shebang in node-gyp. + (substitute* "deps/npm/node_modules/node-gyp/bin/node-gyp.= js" + (("#!/usr/bin/env") + (string-append "#!" (assoc-ref inputs "coreutils") "/bi= n/env"))) + ;; FIXME: These tests fail in the build container, but the= y don't ;; seem to be indicative of real problems in practice. (for-each delete-file =2D- 2.33.0