guix_mirror_bot pushed a commit to branch lua-team
in repository guix.
commit ccce4060a0b767d6d9229ad0e0553852e23144f6
Author: Carlo Zancanaro <[email protected]>
AuthorDate: Wed Feb 4 23:01:42 2026 +1100
gnu: awesome: Remove setting of LUA_{,C}PATH, and wrap GUIX_LUA_{,C}PATH.
* gnu/packages/wm.scm (awesome)[arguments]<#:phases>{set-paths}: Don't set
LUA_PATH and LUA_CPATH.
{wrap}: Wrap GUIX_LUA_PATH and GUIX_LUA_CPATH in wrapper.
Change-Id: I79c165f514bfc783184b79c7166b1322b3598ea9
Signed-off-by: Andreas Enge <[email protected]>
---
gnu/packages/wm.scm | 33 +++------------------------------
1 file changed, 3 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index c61c257060..8166c33e13 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1971,33 +1971,8 @@ for wlroots-based Wayland compositors.")
(("(terminal = ).*$" _ p)
(string-append p "'" (assoc-ref inputs "xterm")
"/bin/xterm'\n")))
;; 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)))
- (lua-dependencies
- (filter (match-lambda
- ((label . _) (string-prefix? "lua-" label)))
- inputs))
- (lua-path
- (string-join
- (map (match-lambda
- ((_ . dir)
- (string-append
- dir "/share/lua/" lua-version "/?.lua;"
- dir "/share/lua/" lua-version "/?/?.lua")))
- lua-dependencies)
- ";"))
- (lua-cpath
- (string-join
- (map (match-lambda
- ((_ . dir)
- (string-append
- dir "/lib/lua/" lua-version "/?.so;"
- dir "/lib/lua/" lua-version "/?/?.so")))
- lua-dependencies)
- ";")))
+ (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")))
(setenv "LD_LIBRARY_PATH" cairo)
- (setenv "LUA_PATH" (string-append "?.lua;" lua-path))
- (setenv "LUA_CPATH" lua-cpath)
(setenv "HOME" (getcwd))
(setenv "XDG_CACHE_HOME" (getcwd)))))
(replace 'check
@@ -2018,10 +1993,8 @@ for wlroots-based Wayland compositors.")
(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
- (,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version)))
- `("LUA_CPATH" ";" suffix
- (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version)))
+ `("GUIX_LUA_PATH" ";" prefix (,(getenv "GUIX_LUA_PATH")))
+ `("GUIX_LUA_CPATH" ";" prefix (,(getenv "GUIX_LUA_CPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))
`("LD_LIBRARY_PATH" suffix (,cairo)))))))))
(home-page "https://awesomewm.org/";)
