From: Jelle Licht <wordempire@gmail.com>
To: Efraim Flashner <efraim@flashner.co.il>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH] gnu: node: Correctly patch npm shebang.
Date: Wed, 15 Jun 2016 13:03:59 +0200 [thread overview]
Message-ID: <87a8imlnmo.fsf@gmail.com> (raw)
In-Reply-To: <20160615105711.GA6907@debian-netbook>
[-- Attachment #1: Type: text/plain, Size: 896 bytes --]
Efraim Flashner <efraim@flashner.co.il> writes:
> On Wed, Jun 15, 2016 at 12:39:29PM +0200, Jelle Licht wrote:
>>
>> Jelle Licht <jlicht@fsfe.org> writes:
>>
>> > * gnu/packages/node.scm (node): Correctly patch npm shebang.
>> > ---
>> > gnu/packages/node.scm | 6 ++++++
>> > 1 file changed, 6 insertions(+)
>> >
>> > diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
>> > index 2f269d0..2cedda8 100644
>> > --- a/gnu/packages/node.scm
>> > +++ b/gnu/packages/node.scm
>> > @@ -51,8 +51,14 @@
>>
>> This patch should be applied to core-updates, as it depends on the
>> correct handling of symlinks in the `patch-shebangs' phase introduced by
>> Ludo's recent patch [1].
>>
>> Thanks,
>> - Jelle
>>
>> [1]https://lists.gnu.org/archive/html/bug-guix/2016-06/msg00043.html
>>
>
> I think you forgot to attach the patch :)
It was in the first message body, but for good measure:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch file --]
[-- Type: text/x-diff, Size: 1270 bytes --]
From d01a35d3ef5b2619807b666e4f4126143a0bf08a Mon Sep 17 00:00:00 2001
From: Jelle Licht <jlicht@fsfe.org>
Date: Wed, 15 Jun 2016 12:22:40 +0200
Subject: [PATCH] gnu: node: Correctly patch npm shebang.
To: guix-devel@gnu.org
* gnu/packages/node.scm (node): Correctly patch npm shebang.
---
gnu/packages/node.scm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index 2f269d0..2cedda8 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -51,8 +51,14 @@
"--shared-zlib"
"--shared-libuv"
"--without-snapshot")
+ ;#:tests? #f
#:phases
(modify-phases %standard-phases
+ (add-after 'patch-shebangs 'patch-npm-shebang
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; XXX: patch-shebangs does not patch this file by default
+ (let ((out (assoc-ref outputs "out")))
+ (patch-shebang (string-append out "/lib/node_modules/npm/bin/npm-cli.js") (list (string-append out "/bin"))))))
(add-before 'configure 'patch-files
(lambda* (#:key inputs #:allow-other-keys)
;; Fix hardcoded /bin/sh references.
--
2.8.4
prev parent reply other threads:[~2016-06-15 11:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-15 10:22 [PATCH] gnu: node: Correctly patch npm shebang Jelle Licht
2016-06-15 10:39 ` Jelle Licht
2016-06-15 10:57 ` Efraim Flashner
2016-06-15 11:03 ` Jelle Licht [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87a8imlnmo.fsf@gmail.com \
--to=wordempire@gmail.com \
--cc=efraim@flashner.co.il \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.