05/06: gnu: awesome: Fix command completion in the prompt and Lua paths

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 1af5e57d875000bfe878ca8e4435c2899fb66914
Author: Ivan Kozlov <kanichos@yandex.ru>
AuthorDate: Fri Jul 31 11:18:23 2020 +0300

    gnu: awesome: Fix command completion in the prompt and Lua paths
    
    * gnu/packages/wm.scm (awesome): Delete useless ‘env’ invocation in 
lib/awful/completion.lua.  Change the delimiter for LUA_PATH and LUA_CPATH 
variables.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/wm.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 000ec8b..be23980 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -973,6 +973,9 @@ experience.")
        (modify-phases %standard-phases
          (add-before 'configure 'set-paths
            (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "lib/awful/completion.lua"
+               (("/usr/bin/env")
+                ""))
              ;; The build process needs to load Cairo dynamically.
              (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib"))
                     (lua-version ,(version-major+minor (package-version lua)))
@@ -1021,9 +1024,9 @@ experience.")
                     (lua-version ,(version-major+minor (package-version lua)))
                     (lua-lgi (assoc-ref inputs "lua-lgi")))
                (wrap-program (string-append awesome "/bin/awesome")
-                 `("LUA_PATH" suffix
+                 `("LUA_PATH" ";" suffix
                    (,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version)))
-                 `("LUA_CPATH" suffix
+                 `("LUA_CPATH" ";" suffix
                    (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version)))
                  `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
                  `("LD_LIBRARY_PATH" suffix (,cairo)))