From patchwork Sat Nov 20 04:33:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34673 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 E113527BBE1; Sat, 20 Nov 2021 04:35:20 +0000 (GMT) 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, 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 7366627BBE1 for ; Sat, 20 Nov 2021 04:35:20 +0000 (GMT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI5v-0002J8-Iw for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:35:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5f-0002Ij-3P for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5e-0007OI-Jd for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5e-0007wv-GS; Fri, 19 Nov 2021 23:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 03/26] gnu: node: Patch shebangs in node_modules. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 20 Nov 2021 04:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51838 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51838@debbugs.gnu.org Cc: Liliana Marie Prikler X-Debbugs-Original-Xcc: Liliana Marie Prikler Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163738286130244 (code B ref 51838); Sat, 20 Nov 2021 04:35:02 +0000 Received: (at 51838) by debbugs.gnu.org; 20 Nov 2021 04:34:21 +0000 Received: from localhost ([127.0.0.1]:41169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4y-0007re-Du for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:20 -0500 Received: from mail-qv1-f48.google.com ([209.85.219.48]:37439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4t-0007qX-2Y for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:15 -0500 Received: by mail-qv1-f48.google.com with SMTP id u16so8545834qvk.4 for <51838@debbugs.gnu.org>; Fri, 19 Nov 2021 20:34:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vNLOSTWhsUvYl4zbQmT0Z6mwdgkAqlBATEO6lq8SgZA=; b=DW/JLx/bsBYpFKBmrZgbkDSDSyHVU8MWjdDIHStgEsg8q8WskYPrB+YDpedxENSK0C H6B0xPPTy94CUdrTUbpU3dPBhEoHb5vEgVebS+qwT6xKjLhwExx7KkIS+X6sBTetRrD6 dUvQh9Nk9TRY4svjwK4XT/Sd/TIedBCgqfzDW20wX4rlWLrIBJqkLaLCZudhvLMaWthS qbJ4rfK9VJwb8gNuFzYhnt58XdfJxdIADNeF1a8r+G8wTs+4Wczgs8d19j6kTl6t63Uq 29V98snJnyF4+DbVQhhnnkdmNBfH9AHXCw7L4A1iexJs/3hHL+vzX+u1Nlw95A3kW4l+ 7ieA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vNLOSTWhsUvYl4zbQmT0Z6mwdgkAqlBATEO6lq8SgZA=; b=02f/71S/GswCodhGWxPxiZN86ZPdcl3A1kD3MGLl59uuYqyIQ+xe88Vjm+tkWnnDUv Xx9PJmk0M6/gM8ciwhkwOF3p7iwMaxvBFCGFAwP4I1xHQx4/pfFxnidEh5HQOwGpzSzW KBcuXjBu/Phpa+P9e4jJ4iBZM7XFStju538D/eSqhTAzP6h2pWuIx5tnMczPeqHxeiLM vE8AQfSXh1FngS8gpmjSXlM+4P0i0iuG4o1yyAvKajHpJy4W0ScnbcIF/5nsOH4WmcZi V4cStnIqiAJWUHIVvdNLzVBODR8/QN4rKk7QlLAffJxpfUU/hZvDrXzCqPTDJUtM4Nj2 ZuMg== X-Gm-Message-State: AOAM533BHCFP13q4UYuqO2WxZ+ERH4rXhDkVd4GZfhssCNK5PfiPbHTk S5UBV2q9ZI6rUIoWJiqaV27DquEjGiyDfmCQ X-Google-Smtp-Source: ABdhPJwf10H466nobbs1bI7S+iIua4Srz84k9IfIR9qlJTFbCKZHRYv8KRExamq7CLOB6sSU0zA6mA== X-Received: by 2002:ad4:5e87:: with SMTP id jl7mr78673917qvb.19.1637382849567; Fri, 19 Nov 2021 20:34:09 -0800 (PST) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id bs7sm974082qkb.79.2021.11.19.20.34.09 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:09 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:43 -0500 Message-Id: <20211120043406.952350-3-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211120043406.952350-1-philip@philipmcgrath.com> References: <5a04aa92-e80d-e11b-235c-b7f5e3a92d00@philipmcgrath.com> <20211120043406.952350-1-philip@philipmcgrath.com> 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 * gnu/packages/node.scm (node)[arguments]: Replace 'patch-npm-shebang and 'patch-node-shebang with a new 'patch-nested-shebangs that also handles node-gyp and other shebangs under "/lib/node_modules". [inputs]: Add Python for node-gyp as "python-for-target". (node-lts)[inputs]: Likewise. (libnode)[arguments]: Adjust to delete 'patch-nested-shebangs rather than 'patch-npm-shebang and 'patch-node-shebang. --- gnu/packages/node.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 71b66774a6..a57a74fb81 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -237,21 +237,20 @@ (define-public node python (string-append python "3"))) "configure" flags)))) - (add-after 'patch-shebangs 'patch-npm-shebang - (lambda* (#:key outputs #:allow-other-keys) - (let* ((bindir (string-append (assoc-ref outputs "out") - "/bin")) - (npm (string-append bindir "/npm")) - (target (readlink npm))) - (with-directory-excursion bindir - (patch-shebang target (list bindir)))))) - (add-after 'install 'patch-node-shebang - (lambda* (#:key outputs #:allow-other-keys) - (let* ((bindir (string-append (assoc-ref outputs "out") - "/bin")) - (npx (readlink (string-append bindir "/npx")))) - (with-directory-excursion bindir - (patch-shebang npx (list bindir))))))))) + (add-after 'patch-shebangs 'patch-nested-shebangs + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((prefix (assoc-ref outputs "out")) + (path (map (lambda (dir) + (string-append dir "/bin")) + (list prefix + (assoc-ref inputs "python-for-target"))))) + (for-each + (lambda (file) + (patch-shebang file path)) + (find-files (string-append prefix "/lib/node_modules") + (lambda (file stat) + (executable-file? file)) + #:stat lstat)))))))) (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. ("c-ares" ,c-ares) @@ -274,6 +273,7 @@ (define-public node (inputs `(("bash" ,bash-minimal) ("coreutils" ,coreutils) + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3) ("c-ares" ,c-ares) ("http-parser" ,http-parser) ("icu4c" ,icu4c) @@ -799,6 +799,7 @@ (define-public node-lts (inputs `(("bash" ,bash-minimal) ("coreutils" ,coreutils) + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3) ("c-ares" ,c-ares-for-node) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) @@ -817,5 +818,4 @@ (define-public libnode `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases - (delete 'patch-npm-shebang) - (delete 'patch-node-shebang))))))) + (delete 'patch-nested-shebangs)))))))