futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: node: Fix cross-compilation.

Browse Source 
* gnu/packages/node.scm (node)[phases]{configure}: Unwind the stack before
invoking the exception handler.
{patch-hardcoded-program-references}: Use search-input-file where appropriate.
This commit is contained in:
Jelle Licht 2022-06-05 17:38:38 +02:00
parent 6b96ef08b9
commit e71f35df74
No known key found for this signature in database
GPG Key ID: DA4597F947B41025
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/packages/node.scm
View File

@ -128,7 +128,7 @@
(cons sigxfsz common)
common))
(("'/bin/sh'")
(string-append "'" (assoc-ref inputs "bash") "/bin/sh'")))
(string-append "'" (search-input-file inputs "/bin/sh") "'")))
;; Fix hardcoded /usr/bin/env references.
(substitute* '("test/parallel/test-child-process-default-options.js"
@ -245,7 +245,8 @@
(search-input-file inpts "/bin/python3")
(raise-exception e)))
(lambda ()
(search-input-file inpts "/bin/python"))))
(search-input-file inpts "/bin/python"))
#:unwind? #t))
"configure"
flags))))
(add-after 'patch-shebangs 'patch-nested-shebangs