diff options
| author | Ivan Kozlov <kanichos@yandex.ru> | 2020-07-31 11:18:23 +0300 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-09-24 17:53:02 +0200 |
| commit | 1af5e57d875000bfe878ca8e4435c2899fb66914 (patch) | |
| tree | 469609f6f72f3b829b1dc8a3fbfab023f1bb7f3f | |
| parent | dca2f0ea01453bae2109ef0fe8460bcd67a55634 (diff) | |
| download | guix-1af5e57d875000bfe878ca8e4435c2899fb66914.tar guix-1af5e57d875000bfe878ca8e4435c2899fb66914.tar.gz | |
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>
| -rw-r--r-- | gnu/packages/wm.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 000ec8bd27..be23980a12 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))) |