From patchwork Wed Dec 8 20:27:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 35023 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 1FF8527BBEA; Wed, 8 Dec 2021 20:29:30 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3F07527BBE9 for ; Wed, 8 Dec 2021 20:29:29 +0000 (GMT) Received: from localhost ([::1]:44262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mv3ZA-0005z1-Dp for patchwork@mira.cbaines.net; Wed, 08 Dec 2021 15:29:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mv3Yl-0005Ma-Eh for guix-patches@gnu.org; Wed, 08 Dec 2021 15:29:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:58245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mv3Yl-0000BG-6n for guix-patches@gnu.org; Wed, 08 Dec 2021 15:29:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mv3Yl-0005pu-2v for guix-patches@gnu.org; Wed, 08 Dec 2021 15:29:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v3 04/43] gnu: node: Add an npmrc file to set nodedir. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 08 Dec 2021 20:29:03 +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 Received: via spool by 51838-submit@debbugs.gnu.org id=B51838.163899533622346 (code B ref 51838); Wed, 08 Dec 2021 20:29:03 +0000 Received: (at 51838) by debbugs.gnu.org; 8 Dec 2021 20:28:56 +0000 Received: from localhost ([127.0.0.1]:41543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mv3Yd-0005oE-Vy for submit@debbugs.gnu.org; Wed, 08 Dec 2021 15:28:56 -0500 Received: from mail-ua1-f46.google.com ([209.85.222.46]:33610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mv3YX-0005mv-PL for 51838@debbugs.gnu.org; Wed, 08 Dec 2021 15:28:50 -0500 Received: by mail-ua1-f46.google.com with SMTP id a14so7019845uak.0 for <51838@debbugs.gnu.org>; Wed, 08 Dec 2021 12:28:49 -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=P+ZUDX3oITFc2FXxDiv6NDaMY9nxH56ylZC7kmmocfU=; b=PXvxLVMoV2K56oitpUCdDKPqCH/BpEcOiw7AxsSnD2OiXJnvtFYdZwPXVRCiQOcuMy mvdNpavNYin25xjVOGeBsN4CqF713UVezQ8KDUlEd0E4x4sPUX2QqPhyT2qKW2w19gG8 1ZdwuHpZx6fCKxqNiHFQj38s9KLOLWijreqMh0vW5MB68vNOFYAogOJ2eT++jGza4yFI urIfq4v7R+d4tNjUPek2v/tg+bD4CqoX8laAtdqV6Tj8UE/LMa4LJ1Y02nFWPFZMuIr7 t12jg2zHIohltrebrM5Hl9RzpE/mBRn89oEeownXSPeS5uAq1G4A9Vgm4v5LLmkizO03 StGw== 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=P+ZUDX3oITFc2FXxDiv6NDaMY9nxH56ylZC7kmmocfU=; b=eROhuspLRwIT9edr/THfsgb2MQbFwTbJy2qA1Ew1eBtH20KrzY4Xqgf/gCcXW4APen 90jH7JvILPbKy7oxIeK+iOXLZaBtYNdp2lmJgABVLxdqXGskYyrk/LU5uQ6/QMLliqkh 0pGdnK8k/TZQX+z3ImwJWDOm14tBU2lyx7vzieRGMCpF66Vy9RW9i24P5DsHXf6UBmSg pbrtZL22i8E+N9Y+QUlI5WvfBmvxROnwuJuTIw76NMBrsNlGEEJm6DgkSQbeb/tXARnq A454PfkgkhxHBqm7CGEEFxNACxsRnpKagwO8gOBTzsNDJ5IhJ1Kvr+E8OOwmO4YMZlRs q/Jw== X-Gm-Message-State: AOAM531YYS9k5003rnYdrCyJhgb6HYzMzNusmSSkXKM5AKFVpqfht4kT qIv3HTpdss74eXl8sKqjUVaJjUuh3TXD/K6hqHk= X-Google-Smtp-Source: ABdhPJyJz45Vxa6kogZxBTtx4riTpXg4hmcDQcGhoCoieGvkRKu/mVHgaKJtMnfCf9df3RZ7m2RXDA== X-Received: by 2002:a9f:266f:: with SMTP id 102mr11225637uag.44.1638995324190; Wed, 08 Dec 2021 12:28:44 -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 6sm2531521vkq.23.2021.12.08.12.28.43 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Dec 2021 12:28:43 -0800 (PST) From: Philip McGrath Date: Wed, 8 Dec 2021 15:27:59 -0500 Message-Id: <20211208202838.752542-5-philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211208202838.752542-1-philip@philipmcgrath.com> References: <46a042bc08eb72a068b1e8c69bfe28cf2d4b2e53.camel@gmail.com> <20211208202838.752542-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, node-lts)[arguments]: Add a phase 'install-npmrc to create a "built-in" npmrc file that configures "nodedir" to point to the output store path. (libnode)[arguments]: Delete the 'install-npmrc phase. --- gnu/packages/node.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index a57a74fb81..0f67fe79c2 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -250,7 +250,21 @@ (define-public node (find-files (string-append prefix "/lib/node_modules") (lambda (file stat) (executable-file? file)) - #:stat lstat)))))))) + #:stat lstat))))) + (add-after 'install 'install-npmrc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (with-output-to-file + ;; Use the config file "primarily for distribution + ;; maintainers" rather than "{prefix}/etc/npmrc", + ;; especially because node-build-system uses --prefix + ;; to install things to their store paths: + (string-append out "/lib/node_modules/npm/npmrc") + (lambda () + ;; Tell npm (mostly node-gyp) where to find our + ;; installed headers so it doesn't try to + ;; download them from the internet: + (format #t "nodedir=~a\n" out))))))))) (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. ("c-ares" ,c-ares) @@ -818,4 +832,5 @@ (define-public libnode `(cons* "--shared" "--without-npm" ,flags)) ((#:phases phases '%standard-phases) `(modify-phases ,phases + (delete 'install-npmrc) (delete 'patch-nested-shebangs)))))))