unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#42627] [PATCH] gnu: awesome: Fix command completion in the prompt and Lua paths
@ 2020-07-31  8:18 Ivan Kozlov
  2020-09-24 15:43 ` bug#42627: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Ivan Kozlov @ 2020-07-31  8:18 UTC (permalink / raw)
  To: 42627

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

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)))







^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#42627: [PATCH] gnu: awesome: Fix command completion in the prompt and Lua paths
  2020-07-31  8:18 [bug#42627] [PATCH] gnu: awesome: Fix command completion in the prompt and Lua paths Ivan Kozlov
@ 2020-09-24 15:43 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2020-09-24 15:43 UTC (permalink / raw)
  To: Ivan Kozlov; +Cc: 42627-done

Hi,

Ivan Kozlov <kanichos@yandex.ru> skribis:

> * 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’.




^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-09-24 16:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-31  8:18 [bug#42627] [PATCH] gnu: awesome: Fix command completion in the prompt and Lua paths Ivan Kozlov
2020-09-24 15:43 ` bug#42627: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).