From e71f35df74f970a93e0b178fc5a294781b88883a Mon Sep 17 00:00:00 2001 From: Jelle Licht Date: Sun, 5 Jun 2022 17:38:38 +0200 Subject: gnu: node: Fix cross-compilation. * 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. --- gnu/packages/node.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index 41c01cf7e4..c8d81fbd22 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -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 -- cgit v1.2.3