From 209d94fa646729877b7b03d71d9e162f94e5fab0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Jan 2021 10:51:05 +0200 Subject: gnu: fennel: Cross-build. * gnu/packages/lua.scm (fennel)[arguments]: Add phase to patch additional calls to lua binary. Adjust 'patch-fennel phase to specify specific lua location. --- gnu/packages/lua.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0100ed2dd3..80a59c2d6e 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1087,10 +1087,18 @@ (define-public fennel #:phases (modify-phases %standard-phases (delete 'configure) + (add-before 'build 'patch-lua-calls + (lambda* (#:key inputs #:allow-other-keys) + (let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua"))) + (setenv "LUA" lua) + (substitute* "old/launcher.lua" + (("/usr/bin/env lua") lua)) + #t))) (add-after 'build 'patch-fennel - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "fennel" - (("/usr/bin/env lua") (which "lua"))) + (("/usr/bin/env .*lua") + (string-append (assoc-ref inputs "lua") "/bin/lua"))) #t)) (delete 'check) (add-after 'install 'check -- cgit v1.2.3