From e1fc5936b117d9dc35cd37711e9aa032c28b3b14 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Wed, 4 Feb 2026 23:05:22 +1100 Subject: [PATCH] gnu: vis: Remove wrapping of LUA_{,C}PATH and wrap GUIX_LUA_{,C}PATH. * gnu/packages/text-editors.scm (vis)[arguments]<#:phases>{wrap-binary}: Wrap GUIX_LUA_PATH and GUIX_LUA_CPATH instead of LUA_PATH and LUA_CPATH. Change-Id: Id8ff4d37f797c6dba2516241a0ea1c4a20d5451a Signed-off-by: Andreas Enge --- gnu/packages/text-editors.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 0a7865cb10..857307503e 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -370,16 +370,10 @@ intuitive, while also taking advantage of the capabilities of modern terminals." (delete 'check) ; the tests need a wrapped vis (add-after 'install 'wrap-binary (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lpeg (assoc-ref inputs "lua-lpeg")) - (lua-version ,(version-major+minor (package-version lua))) - (LUA_PATH (string-append lpeg "/share/lua/" - lua-version "/?.lua")) - (LUA_CPATH (string-append lpeg "/lib/lua/" - lua-version "/?.so"))) + (let* ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/vis") - `("LUA_PATH" ":" prefix (,LUA_PATH)) - `("LUA_CPATH" ":" prefix (,LUA_CPATH))) + `("GUIX_LUA_PATH" ":" prefix (,(getenv "GUIX_LUA_PATH"))) + `("GUIX_LUA_CPATH" ":" prefix (,(getenv "GUIX_LUA_CPATH")))) #t))) (add-after 'wrap-binary 'check (assoc-ref %standard-phases 'check))