From 09a5f17eec72efd309a3c7a3d5282907522c3e67 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 28 Dec 2023 20:49:11 +0000 Subject: lua-wrapper: fix luaPath and luaCpath definitions Before the change: $ nix-instantiate --eval --strict --expr 'with import ./. {}; with corsix-th.luaEnv; [luaPath luaCpath]' error: error: attribute 'lib' missing After the change: $ nix-instantiate --eval --strict --expr 'with import ./. {}; with corsix-th.luaEnv; [luaPath luaCpath]' [ "/nix/store/f17ah5zjri1yjacc1c50g9xlr8qqwbgh-lua-5.2.4-env/share/lua/5.2/?.lua;/nix/store/f17ah5zjri1yjacc1c50g9xlr8qqwbgh-lua-5.2.4-env/share/lua/5.2/?/init.lua" "/nix/store/f17ah5zjri1yjacc1c50g9xlr8qqwbgh-lua-5.2.4-env/lib/lua/5.2/?.so" ] --- pkgs/development/interpreters/lua-5/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/development/interpreters') diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index 9431522b71e5d..bd97e7186b97f 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -60,8 +60,8 @@ let passthru = lua.passthru // { interpreter = "${env}/bin/lua"; inherit lua; - luaPath = lua.pkgs.lib.genLuaPathAbsStr env; - luaCpath = lua.pkgs.lib.genLuaCPathAbsStr env; + luaPath = lua.pkgs.luaLib.genLuaPathAbsStr env; + luaCpath = lua.pkgs.luaLib.genLuaCPathAbsStr env; env = stdenv.mkDerivation { name = "interactive-${lua.name}-environment"; nativeBuildInputs = [ env ]; -- cgit 1.4.1