From patchwork Sun Aug 29 10:45:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 32363 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 D087D27BBE1; Sun, 29 Aug 2021 11:52:00 +0100 (BST) 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, FREEMAIL_FROM,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 4B80A27BBE3 for ; Sun, 29 Aug 2021 11:51:59 +0100 (BST) Received: from localhost ([::1]:40270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKIPu-0007Av-9w for patchwork@mira.cbaines.net; Sun, 29 Aug 2021 06:51:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKILF-000672-8G for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKILE-0001eb-TE 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-0000Gu-Qy for guix-patches@gnu.org; Sun, 29 Aug 2021 06:47:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49946] [PATCH v2 10/33] guix: node-build-system: Support compiling addons with 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.1630234022880 (code B ref 49946); Sun, 29 Aug 2021 10:47:08 +0000 Received: (at 49946) by debbugs.gnu.org; 29 Aug 2021 10:47:02 +0000 Received: from localhost ([127.0.0.1]:55572 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKIL7-0000Dt-EJ for submit@debbugs.gnu.org; Sun, 29 Aug 2021 06:47:01 -0400 Received: from mout.gmx.net ([212.227.17.21]:56681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKIKj-0000AG-HM for 49946@debbugs.gnu.org; Sun, 29 Aug 2021 06:46:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1630233991; bh=1nQawcoPpnQ/cWAQJ5aFPxfolfxLxPFqFzBtuzewkyU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=SCJ/ib5tsT93qIoZ3kSD86tWiqGIURASipNhpbfU8hBfBu44212uwCvJnJqtRsdb+ PHlO8U9TdJrtN7stfYFF2DbmbF+93ZWGqcvSh3td+CX/b0aGOmGfddO+4or577TLAs aXGypzxfyD9SVcX4mprliLTkqdirgZo0X+mT6vHA= 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 1MIx3C-1mZ5OX2kyQ-00KRzI; Sun, 29 Aug 2021 12:46:31 +0200 From: Pierre Langlois Date: Sun, 29 Aug 2021 11:45:45 +0100 Message-Id: <20210829104608.3103-10-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 X-Provags-ID: V03:K1:V04dxS/jfa51YI1PGQrLluiANiNiGELvjQAN1xlG3qV87tsV4H1 PvrhPeX6Nq5AkZiZZItprJdVeUX1ywHZnE2smJ9YcfwnACrWiU8iB5dI/gFBglxMjT9eFkP 72RhOi3nYnniLuW0QLvuSvoECEhWUksZ+vmyhKrVkt3nhStOvXbz28B2o5vQfXUHdREc6fF MUMt0g8PiGaAiGXfu7dfQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:qq1IjGjISEE=:IwWl2AzOSrIN+OsstozEx+ zGmdBEKF4ei7wNcAcgp3Fi2fAWnS3icRKmpJhdUG+ypNaOKb/nDDONbi0v5Ot/FYCur/6DxOd JDhh+3TOZxayguXYycXQkWEE9n+oZNBZkQVxhfErtKUT0MAOBdXz/Ps1s1v/9Jpcbq5R668v6 phLzfTDnr9trFNfyuoSDPioyptBINz9hsNELQFcKpDnKF7DhPmVR7W/oQAQldtj38g/F+cjXa +w6I4O9db36VMPVMDUsv9TWFr8k7qQG+/idV6dWDVxugkrWZJV93fAkiyt6aMkkiKwOH8hOlU y7aSZHYF27cXHpu4rCeoQwKVXHaMeXVxLe0j/ZKUbyZRZneztzYzDKNG2s8fslLy7OdPXcmna /4hhKocrKa4zgHd1ScnwNae8idqqD8IfxP/EaHM2uhr10R7C6i0QeLHLRpAR9HxY58Jetd+r/ MU9n8EoaVDJxKl4F+BIK0hexZuRmjbgJ8zUhe45AqgspFEQnn/eCZ6210Ooeng1LHagJY4D/Y qWyL5vNhkZqS1i9U9Nqg752orROJHr1Lnpk6t9H0Bisf13dEN95maObAdh4dj43coj1WsxAv5 EvGApy658XlGA8v2ORE/iXDmzTbT+mh2GRjvF3Ns4R101Pc2YMPHsiNzyN2WgLkuSP9FUt9/s 6NxrY6W0gMciGjcUBgLziyDtCJGyYcnQO+gr6aIyqz+W+/oWI0dQXVzeOrAIyuRd1EaKy8U1F vhqmdgGs/oTh6b2sCB+6clGgupjcsBnM1G9YVZVQn5kIw3J0VcxAUo5k+RcWyC5gbPIy3AmNU e9sPkQs7zlU186MndUffpbl/KmpC/pj/tWEG7rMQoIKSGci4oNvXrTW2dWe7PAr0BI5767YKU Jl/j7JNv84qosThbaa+RcNUVaTQy0TtDf2zNZNSjFvRaU92N+bbAJiC9gAYgWTDo9whFpzwrD fAwNaNe8fhZLZSLmSsulog/6QdKCRLTYJ4QhgGoKYbIy2VfoOFKKZazpLGXZux5CATCcv0GWu dLsMVqnV7xZmj52JuIl6R1k2T4NGraXW6/sjFC8o1nOeh98hZDZCRRbMIhvIKQYP/SbJeJbtF VTFEFW0Jp6Td8ZJXUx7UP6OXh525PgAxnDFpv0L+F5fAx1CDyOW58mU8w== 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-headers): New function. * guix/build-system/node.scm (python): New function. (node-headers): New function. (lower): Add node-headers and python to build inputs. * guix/build/node-build-system.scm (configure-gyp): New function. (%standard-phases): Add 'configure-gyp after 'configure. --- gnu/packages/node.scm | 19 ++++++++++++++++++- guix/build-system/node.scm | 16 ++++++++++++++++ guix/build/node-build-system.scm | 15 +++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) -- 2.33.0 diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 530c04bc68..a6dab75309 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -48,7 +48,24 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages tls) - #:use-module (gnu packages web)) + #:use-module (gnu packages web) + #:use-module (ice-9 match) + #:export (node-headers)) + +(define (node-headers node) + "Return an object for a tarball with headers for the given node +package version." + (let* ((version (package-version node)) + (hash (match version + ("10.24.0" + "0h37zjwcpxjdqcxqjfj5zp1n5zjxaa0g8lsy83955afg5cca8p0n") + ("14.16.0" + "1vpdgq7kcw1a0w90lpvbvxbrc0n3pwjrs3sm42pjj7560clvji2b")))) + (origin + (method url-fetch) + (uri (string-append "https://nodejs.org/dist/v" version + "/node-v" version "-headers.tar.gz")) + (sha256 (base32 hash))))) (define-public node (package diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 98f63f87ef..7828582a9a 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2016 Jelle Licht ;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -41,6 +42,19 @@ (let ((node (resolve-interface '(gnu packages node)))) (module-ref node 'node-lts))) +(define (python) + "Return the python package." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((module (resolve-interface '(gnu packages python)))) + (module-ref module 'python-wrapper))) + +(define (node-headers node) + "Return a tarball with headers for the given node, needed for packages that +need to build native bindings using node-gyp." + ;; Lazily resolve the binding to avoid a circular dependency. + (let ((module (resolve-interface '(gnu packages node)))) + ((module-ref module 'node-headers) node))) + (define* (lower name #:key source inputs native-inputs outputs system target (node (default-node)) @@ -62,6 +76,8 @@ ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("node" ,node) + ("node-headers" ,(node-headers 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..2993c49b2b 100644 --- a/guix/build/node-build-system.scm +++ b/guix/build/node-build-system.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016, 2020 Jelle Licht ;;; Copyright © 2019, 2021 Timothy Sample +;;; Copyright © 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,6 +102,19 @@ (invoke npm "--offline" "--ignore-scripts" "install") #t)) +(define* (configure-gyp #:key inputs #:allow-other-keys) + "Run 'node-gyp configure' if we see a 'binding.gyp' file. + +By default, 'node-gyp' will try to download node headers from the internet, we +prevent this with the '--tarball' flag." + (let ((node-gyp (string-append (assoc-ref inputs "node") + "/lib/node_modules/npm/node_modules/node-gyp" + "/bin/node-gyp.js"))) + (if (file-exists? "binding.gyp") + (invoke node-gyp "--tarball" (assoc-ref inputs "node-headers") + "configure")) + #t)) + (define* (build #:key inputs #:allow-other-keys) (let ((package-meta (call-with-input-file "package.json" read-json))) (if (and=> (assoc-ref package-meta "scripts") @@ -147,6 +161,7 @@ (add-after 'unpack 'set-home set-home) (add-before 'configure 'patch-dependencies patch-dependencies) (replace 'configure configure) + (add-after 'configure 'configure-gyp configure-gyp) (replace 'build build) (replace 'check check) (add-before 'install 'repack repack)