02/03: gnu: fennel: Cross-build.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 209d94fa646729877b7b03d71d9e162f94e5fab0
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Jan 25 10:51:05 2021 +0200

    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 0100ed2..80a59c2 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -1087,10 +1087,18 @@ shell command executions.")
        #: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