tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: prosody: Remove wrapping of LUA_{,C}PATH and wrap GUIX_LUA_{,C}PATH.

Browse Source 
* 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>
This commit is contained in:
Carlo Zancanaro
2026-02-04 23:07:11 +11:00
committed by Andreas Enge
parent e1fc5936b1
commit 490b5b2ffa
1 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gnu/packages/messaging.scm
View File

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