JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luakit: Update for Lua search path handling change

Browse Source
This commit is contained in:
Alexei Robyn 2019-08-21 23:09:15 +10:00 committed by Frederik Rietdijk
parent c62337d9c7
commit a7297610a2
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/luakit/default.nix
View File

@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
# TODO: why is not this the default? The test runner adds
# ';./lib/?.lua;./lib/?/init.lua' to package.path, but the build-utils
# scripts don't add an equivalent
export LUA_PATH="$NIX_LUA_PATH;./?.lua;./?/init.lua"
export LUA_CPATH="$NIX_LUA_CPATH"
export LUA_PATH="$LUA_PATH;./?.lua;./?/init.lua"
'';
makeFlags = [
@ -49,8 +48,8 @@ stdenv.mkDerivation rec {
in ''
gappsWrapperArgs+=(
--prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
--prefix LUA_PATH ';' "${luaKitPath};$NIX_LUA_PATH"
--prefix LUA_CPATH ';' "$NIX_LUA_CPATH"
--prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
--prefix LUA_CPATH ';' "$LUA_CPATH"
)
'';