luakit: Update for Lua search path handling change
This commit is contained in:
parent
c62337d9c7
commit
a7297610a2
@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
|
|||||||
# TODO: why is not this the default? The test runner adds
|
# TODO: why is not this the default? The test runner adds
|
||||||
# ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
|
# ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
|
||||||
# scripts don't add an equivalent
|
# scripts don't add an equivalent
|
||||||
export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua"
|
export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua"
|
||||||
export LUA_CPATH="$NIX_LUA_CPATH"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
makeFlags = [
|
makeFlags = [
|
||||||
@ -49,8 +48,8 @@ stdenv.mkDerivation rec {
|
|||||||
in ''
|
in ''
|
||||||
gappsWrapperArgs+=(
|
gappsWrapperArgs+=(
|
||||||
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
|
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
|
||||||
--prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH"
|
--prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
|
||||||
--prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
|
--prefix LUA_CPATH ';' "$LUA_CPATH"
|
||||||
)
|
)
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user