From patchwork Sat Nov 20 04:33:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 34682 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 469C427BBE4; Sat, 20 Nov 2021 04:36:05 +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 DD78A27BBE1 for ; Sat, 20 Nov 2021 04:36:04 +0000 (GMT) Received: from localhost ([::1]:36218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1moI6e-0003Y2-1P for patchwork@mira.cbaines.net; Fri, 19 Nov 2021 23:36:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1moI5g-0002J4-V8 for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1moI5f-0007OU-3Z for guix-patches@gnu.org; Fri, 19 Nov 2021 23:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1moI5f-0007x6-0y; Fri, 19 Nov 2021 23:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51838] [PATCH v2 04/26] gnu: node: Add an npmrc file to set nodedir. 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.163738286130252 (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]:41171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4y-0007rl-QU for submit@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:21 -0500 Received: from mail-qk1-f176.google.com ([209.85.222.176]:34726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1moI4u-0007qZ-1X for 51838@debbugs.gnu.org; Fri, 19 Nov 2021 23:34:16 -0500 Received: by mail-qk1-f176.google.com with SMTP id t6so12402135qkg.1 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=laPpxNN++I5Kngpc08bz6Lh1/8GAB9Aqp19GJIgLjfk=; b=SLLvjGTOB2lwoFgZqNzxzxbCIYAtG7gzzVeTWU2/PoOsOiy0zxOUOjiFq6giKMMEbR NQ30RulGoCpCEEun1ybjdCoiuzV9OxdVuA019FCS3B37jCiciWce9+01efYkVNA2GOVX yg7Wj168DEX5HGzh4ZHw+/m6S9paBnHF7xVNeYdfUyLgrKU/sTcD4tnOwZor4yOVW840 gafO55SxDupWO5cL8M5tY5R3Je/UGMPacaltylIWGroHCiPM0jLoRMOGmRh7pEEHFAJa IyGekLlb9NU0pY+KwjIAGE1HJP5oABIcjlbjBkQR0UPfrpS7q/U5yjvaJLP6kqEUW84P ywuA== 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=laPpxNN++I5Kngpc08bz6Lh1/8GAB9Aqp19GJIgLjfk=; b=WBqCLv10a1B7l1UBZ49rK/N4Ft5LRJcXqvgTY07YZE74onXnzifUw6FM45wROCgXQs kx/TlJk7zyBDwO7MsJr5L7g6w6OXGWdTCuiz6bDbarreFckplCRdcD4GNQHRG5ciyq6K gbw5OxZihC5jLEAwoINwKqCfUKcCWOCPmPLiXPrGLsYPSiMoWa5T8pems1ed0TNVI+eq A5XlgWaD/RKyQRPA7PZGsGiz5SLYtyMocfarISufvWMF/dIMj8h6yMZXQvixt5d0cjMU fHaq+HWKLpcRShGVkFRZvIAyrG7Nl4o/1QIj1PIb04EXQou1EesqydXAKJ6BWwbUc4Ba qO+A== X-Gm-Message-State: AOAM531Y+XQHMFw39govvDFjrdrsHbBQMRyPimNQywPQPSF9bfU1YDEy f89hKxKB8zZaLn5zohWhqynmQBB2aJN3svPX X-Google-Smtp-Source: ABdhPJz3iH5auJ9EBJpru2jWpb60QUNPSVQd/QZh88o+aTWRe/5//WYMsfG2N3Z2QERODaYlL+e2xQ== X-Received: by 2002:a37:9f84:: with SMTP id i126mr33780996qke.249.1637382850464; Fri, 19 Nov 2021 20:34:10 -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 v125sm990534qki.63.2021.11.19.20.34.10 for <51838@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Nov 2021 20:34:10 -0800 (PST) From: Philip McGrath Date: Fri, 19 Nov 2021 23:33:44 -0500 Message-Id: <20211120043406.952350-4-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, node-lis)[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)))))))