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 KKGzMqJBVmFohAEAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 01:00:50 +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 OPZwLqJBVmHbFwAA1q6Kng (envelope-from ) for ; Thu, 30 Sep 2021 23:00:50 +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 480CE2CEE5 for ; Fri, 1 Oct 2021 01:00:50 +0200 (CEST) Received: from localhost ([::1]:37602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mW52n-0000Iq-Bq for larch@yhetil.org; Thu, 30 Sep 2021 19:00:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mW523-0000HI-Ds for guix-patches@gnu.org; Thu, 30 Sep 2021 19:00:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mW523-0001es-4O for guix-patches@gnu.org; Thu, 30 Sep 2021 19:00:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mW523-0000fZ-42 for guix-patches@gnu.org; Thu, 30 Sep 2021 19:00:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH 3/3] guix: node-build-system: Support compiling addons with node-gyp. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Sep 2021 23:00:03 +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 , Maxime Devos , Philip McGrath Received: via spool by 49946-submit@debbugs.gnu.org id=B49946.16330427992526 (code B ref 49946); Thu, 30 Sep 2021 23:00:03 +0000 Received: (at 49946) by debbugs.gnu.org; 30 Sep 2021 22:59:59 +0000 Received: from localhost ([127.0.0.1]:54293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mW51v-0000eb-Ac for submit@debbugs.gnu.org; Thu, 30 Sep 2021 18:59:58 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:33729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mW51t-0000eL-12 for 49946@debbugs.gnu.org; Thu, 30 Sep 2021 18:59:54 -0400 Received: by mail-qk1-f173.google.com with SMTP id d207so7523836qkg.0 for <49946@debbugs.gnu.org>; Thu, 30 Sep 2021 15:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MEAkXxHZyy5STr2gwnfyP0AmLavcDqzfePCTPSpj+lE=; b=Bd9f/DCXxqgMChpWzC3aVC+p6GBzcBwU89Vg2dNOIgyp8R6YpvHbjsvjyB4T0Q+061 Sfxl5EXUT/hZzeRcipNIkLVfQ+x9DuvhYrT7TFmpOgMFqSTqqEiDztpflpqR8oyixa9x mNc4uBn1J4GAs4rPQVUbpXIaewyBzIyOKGpbyLI2TbJd9U7QGuEgbT2FyMMx84kxMAxl U6l81zyfAm+IIMM+uXUxOLEvXHFnZU8eCsOSHnex//shLz49MskKDOnpZ5eb242HCDjp RYKKJAh+l43+stavAlFjBjqJnga5o3yqeq8IdTofHIrBeMFK8fbJZKvDpeKPiWmkNWh/ yN/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MEAkXxHZyy5STr2gwnfyP0AmLavcDqzfePCTPSpj+lE=; b=fqHTo/gr7+CcnRB2N5I5uE0B6JJ75qFa1amQfUpJT08kmS/J523nQVgBxgLXs/XfO8 OsynvrHqBEicNSpUc7XpzO3XtdtamUh0mX3+pGwukMU1exJemON+B41FXdUJC2/dSwEQ uUmvfcitNjF/tt072LEeyaut4PtShaLY054YEj6FxRJuOJ7LZ/t96Cr5s2/oJeaps4oy znwclLT+OZSECkHbbpag10oidsMd8MGzAXEecf7hGhBwbWYfjfWsoOwJAzktAtqCJyNA pXsrVEn4wQlW/C66crozw/toBBUSw7eB1jGMWG12avyF6WSJiThAByd3aMPnEMQFvlVh g+6g== X-Gm-Message-State: AOAM533Wp8hYGdANbaFRwk0zjrj0vX6qhB3qB1u3VUZNhaoDpjEx7j6C aVE3hJCJnDEq4RX0PZS7a4xnqkPcadxb6VDu X-Google-Smtp-Source: ABdhPJxXcBu1IU2gqprrhOV6cpt8s1SkuB5RKNYAKeXsLyoKWSGLXIdstdOgup+cxzGL1fBGhiLfyQ== X-Received: by 2002:a37:9202:: with SMTP id u2mr7129058qkd.454.1633042787361; Thu, 30 Sep 2021 15:59:47 -0700 (PDT) Received: from localhost (c-73-125-89-242.hsd1.fl.comcast.net. [73.125.89.242]) by smtp.gmail.com with ESMTPSA id w7sm2468864qtc.29.2021.09.30.15.59.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 30 Sep 2021 15:59:47 -0700 (PDT) From: Philip McGrath Date: Thu, 30 Sep 2021 18:56:14 -0400 Message-Id: <20210930225611.2143194-4-philip@philipmcgrath.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210930225611.2143194-1-philip@philipmcgrath.com> References: <682f2ed3-90bd-a9f8-1193-34bef399ca62@philipmcgrath.com> <87h7fztt60.fsf@gmx.com> <20210808233354.6745-1-pierre.langlois@gmx.com> <20210808233354.6745-8-pierre.langlois@gmx.com> <42e10baddb6afe308f67c3240bf5da8159e6f118.camel@telenet.be> <87o88gq5p5.fsf@gmx.com> <20210930225611.2143194-1-philip@philipmcgrath.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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=1633042850; 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=MEAkXxHZyy5STr2gwnfyP0AmLavcDqzfePCTPSpj+lE=; b=Ep2168SPNf0KpKhbK5jX/n+DSEngSGWVmookH3BAWn06veWHp/q7ksq0N8qk2/rTK71BUH okuOCDVnqEHYIr19UAGEuZfWWTClVruK4ZHQdbNvd5PH99M5YYGg3CQMNwjHEo+LUAuUSf YshgavFXTKUOx+gSmCcUPz+JuobUndEN+P7OS8UPprSHU6w7HpCQdJnW6r8Wkt7XnzxxRF 4C9FKuQ6YrhSOHtC5jLGIW9SSTkLOR2bI+u2XNbnyjbwiwXc9KcKnDOW/FCImnXtJGMuFe SX+C0ECwde6/g6I1bvqHm4JhI8nltFTD9YUSrsfMZC6z5+bUkQFeaJG6ur7IuQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633042850; a=rsa-sha256; cv=none; b=WlsOyFgTXANIgmuWhk5nmpqusvRSp4uuE5le9rsxescJiO0YdSQTRvBe94l0ab7CYyRRCd nQ1OP3V50WZ6FLjVQfPYgex2IVbP5GvSL71G/L7COaY2EP0aTjXCQ8ZLjwXAJ0qkLBnLpn v8LyhACFCVouRqvE2F/loZUuWLX3iOHTAMHKp67YbQObIxcjn3hz8ak4ugEdC8HYeDbIXe sO7PcubL+VSDzVqre76u2l0enGTCE5FfQFi61k1cwsPDnsawi6FFZoC+6bxsYxaSeFefRu Ebewk29JzITf6BoGQ9LXYOi6c6JsOCV06UgfQPTwwwZlWuRPZ3xZ7lUxnD3U6w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b="Bd9f/DCX"; dmarc=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-Spam-Score: -0.80 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=philipmcgrath.com header.s=google header.b="Bd9f/DCX"; dmarc=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: 480CE2CEE5 X-Spam-Score: -0.80 X-Migadu-Scanner: scn1.migadu.com X-TUID: Byyr5OzUILHs * 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. * guix/build-system/node.scm (lower): Add optional #:python argument. * guix/build/node-build-system.scm (set-node-gyp-paths): New function. Sets the "npm_config_nodedir" and "npm_config_python" environment variables. (%standard-phases): Add 'set-node-gyp-paths after 'set-paths. Co-authored-by: Pierre Langlois --- gnu/packages/node.scm | 33 +++++++++++++++++--------------- guix/build-system/node.scm | 7 ++++++- guix/build/node-build-system.scm | 9 +++++++++ 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 6d9c3ccc71..805a4f18fc 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -244,21 +244,22 @@ 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"))))) + (with-directory-excursion (string-append prefix "/lib/node_modules") + (for-each + (lambda (file) + (patch-shebang file path)) + (find-files "." + (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (zero? (logand (stat:mode stat) #o100))))) + #:stat lstat))))))))) (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. ("c-ares" ,c-ares) @@ -281,6 +282,7 @@ (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) @@ -764,6 +766,7 @@ source files.") (inputs `(("bash" ,bash-minimal) ("coreutils" ,coreutils) + ("python-for-target" ,python-wrapper) ;; for node-gyp (supports python3) ("c-ares" ,c-ares) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 98f63f87ef..3e49e67ff6 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -1,6 +1,8 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +26,7 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) + #:use-module (guix build-system python) #:use-module (ice-9 match) #:export (%node-build-system-modules node-build @@ -44,11 +47,12 @@ (define* (lower name #:key source inputs native-inputs outputs system target (node (default-node)) + (python (default-python)) ;; for node-gyp #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords - '(#:source #:target #:node #:inputs #:native-inputs)) + '(#:source #:target #:node #:python #:inputs #:native-inputs)) (and (not target) ;XXX: no cross-compilation (bag @@ -62,6 +66,7 @@ ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("node" ,node) + ("python" ,python) ,@native-inputs)) (outputs outputs) (build node-build) diff --git a/guix/build/node-build-system.scm b/guix/build/node-build-system.scm index 70a367618e..5e62eb4784 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -2,6 +2,8 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016, 2020 Jelle Licht ;;; Copyright © 2019, 2021 Timothy Sample +;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021 Philip McGrath ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +48,12 @@ (format #t "set HOME to ~s~%" (getenv "HOME"))))))) #t) +(define* (set-node-gyp-paths #:key inputs #:allow-other-keys) + "Initialize environment variables needed for building native addons." + (setenv "npm_config_nodedir" (assoc-ref inputs "node")) + (setenv "npm_config_python" (assoc-ref inputs "python")) + #t) + (define (module-name module) (let* ((package.json (string-append module "/package.json")) (package-meta (call-with-input-file package.json read-json))) @@ -144,6 +152,7 @@ (define %standard-phases (modify-phases gnu:%standard-phases + (add-after 'set-paths 'set-node-gyp-paths set-node-gyp-paths) (add-after 'unpack 'set-home set-home) (add-before 'configure 'patch-dependencies patch-dependencies) (replace 'configure configure) -- 2.30.2