diff options
| author | Carlo Zancanaro <carlo@zancanaro.id.au> | 2026-02-04 23:07:11 +1100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-18 21:02:26 +0100 |
| commit | 490b5b2ffae37cf5cff35da83ab794dd78a39180 (patch) | |
| tree | 6b06009d65fdb59670d52e83019893904f0d459d /gnu | |
| parent | e1fc5936b117d9dc35cd37711e9aa032c28b3b14 (diff) | |
gnu: prosody: Remove wrapping of LUA_{,C}PATH and wrap GUIX_LUA_{,C}PATH.
* gnu/packages/messaging.scm (prosody)[arguments]<#:phases>{wrap-programs}:
Wrap GUIX_LUA_PATH and GUIX_LUA_CPATH instead of LUA_PATH and LUA_CPATH.
Change-Id: I5fb6b3f216433261048562e8902c8cf92d22d060
Signed-off-by: Andreas Enge <andreas@enge.fr>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/messaging.scm | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 21bd718119..c945da8c4a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1481,25 +1481,6 @@ default.") ;; modules at runtime. (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/")) - (deps (delete #f (map (match-lambda - ((label . directory) - (if (string-prefix? "lua" label) - directory #f))) - inputs))) - (lua-path (string-join - (map (lambda (path) - (string-append - path "/share/lua/5.2/?.lua;" - path "/share/lua/5.2/?/?.lua")) - (cons out deps)) - ";")) - (lua-cpath (string-join - (map (lambda (path) - (string-append - path "/lib/lua/5.2/?.so;" - path "/lib/lua/5.2/?/?.so")) - (cons out deps)) - ";")) (openssl (assoc-ref inputs "openssl")) (coreutils (assoc-ref inputs "coreutils")) (path (map (lambda (dir) @@ -1507,8 +1488,8 @@ default.") (list openssl coreutils)))) (for-each (lambda (file) (wrap-program file - `("LUA_PATH" ";" = (,lua-path)) - `("LUA_CPATH" ";" = (,lua-cpath)) + `("GUIX_LUA_PATH" ";" prefix (,(getenv "GUIX_LUA_PATH"))) + `("GUIX_LUA_CPATH" ";" prefix (,(getenv "GUIX_LUA_CPATH"))) `("PATH" ":" prefix ,path))) (find-files bin ".*")))))))) (inputs |