From a7297610a2c10f763daa7deb5f1d22ef16e9826e Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Wed, 21 Aug 2019 23:09:15 +1000 Subject: [PATCH] luakit: Update for Lua search path handling change --- pkgs/applications/networking/browsers/luakit/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 69beeb167590..d679eb56f5bd 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -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" ) '';