[PATCH] gnu: awesome: Fix command completion in the prompt and Lua paths

  • Done
  • quality assurance status badge
Details
2 participants
  • Ivan Kozlov
  • Ludovic Courtès
Owner
unassigned
Submitted by
Ivan Kozlov
Severity
normal
I
I
Ivan Kozlov wrote on 31 Jul 2020 10:18
(name . guix-patches)(address . guix-patches@gnu.org)
484421596182827@mail.yandex.ru
* gnu/packages/wm.scm (awesome): Delete useless ‘env’ invocation in lib/awful/completion.lua. Change the delimiter for LUA_PATH and LUA_CPATH variables.

Toggle diff (26 lines)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index def8fdccd2..133865771a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -947,6 +947,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)))
@@ -995,9 +998,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)))
L
L
Ludovic Courtès wrote on 24 Sep 2020 17:43
(name . Ivan Kozlov)(address . kanichos@yandex.ru)(address . 42627-done@debbugs.gnu.org)
87zh5f5gf5.fsf@gnu.org
Hi,

Ivan Kozlov <kanichos@yandex.ru> skribis:

Toggle quote (2 lines)
> * gnu/packages/wm.scm (awesome): Delete useless ‘env’ invocation in lib/awful/completion.lua. Change the delimiter for LUA_PATH and LUA_CPATH variables.

Applied.

Thanks and sorry for the long delay!

Ludo’.
Closed
?