me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Ivan Kozlov 2020-07-31 11:18:23 +03:00 committed by Ludovic Courtès
parent dca2f0ea01
commit 1af5e57d87
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/wm.scm
View File

@ -973,6 +973,9 @@ experience.")
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'set-paths (add-before 'configure 'set-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "lib/awful/completion.lua"
(("/usr/bin/env")
""))
;; The build process needs to load Cairo dynamically. ;; The build process needs to load Cairo dynamically.
(let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")) (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib"))
(lua-version ,(version-major+minor (package-version lua))) (lua-version ,(version-major+minor (package-version lua)))
@ -1021,9 +1024,9 @@ experience.")
(lua-version ,(version-major+minor (package-version lua))) (lua-version ,(version-major+minor (package-version lua)))
(lua-lgi (assoc-ref inputs "lua-lgi"))) (lua-lgi (assoc-ref inputs "lua-lgi")))
(wrap-program (string-append awesome "/bin/awesome") (wrap-program (string-append awesome "/bin/awesome")
`("LUA_PATH" suffix `("LUA_PATH" ";" suffix
(,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version))) (,(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))) (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version)))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
`("LD_LIBRARY_PATH" suffix (,cairo))) `("LD_LIBRARY_PATH" suffix (,cairo)))