diff options
| author | Matthieu C. <886074+teto@users.noreply.github.com> | 2024-04-30 00:39:17 +0200 |
|---|---|---|
| committer | Matthieu C. <886074+teto@users.noreply.github.com> | 2024-05-01 00:11:49 +0200 |
| commit | a4d954080f71f72f95aee116db8f753f3ded3c2d (patch) | |
| tree | 9bf23e11a2a8539b4dbd6df6f6145e7b1c96451b /pkgs/development/interpreters/lua-5 | |
| parent | 986612811d2990722315ff3c47f0eaa6006b0bc6 (diff) | |
lua: fixed the way to create environments
`paths = requiredLuaModules (extraLibs ++ [ lua ] );` would discard lua and so in absence of a propagated lua, the lua.withPackages would return an empty bin/ directory.
Diffstat (limited to 'pkgs/development/interpreters/lua-5')
| -rw-r--r-- | pkgs/development/interpreters/lua-5/build-luarocks-package.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/interpreters/lua-5/wrapper.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix index 97ac535c93036..cb1b9825e14e8 100644 --- a/pkgs/development/interpreters/lua-5/build-luarocks-package.nix +++ b/pkgs/development/interpreters/lua-5/build-luarocks-package.nix @@ -89,6 +89,7 @@ let generatedRockspecFilename = "./${self.pname}-${self.rockspecVersion}.rockspec"; nativeBuildInputs = [ + lua # for lua.h wrapLua luarocks ]; diff --git a/pkgs/development/interpreters/lua-5/wrapper.nix b/pkgs/development/interpreters/lua-5/wrapper.nix index bd97e7186b97f..b5166739351eb 100644 --- a/pkgs/development/interpreters/lua-5/wrapper.nix +++ b/pkgs/development/interpreters/lua-5/wrapper.nix @@ -10,7 +10,7 @@ # Create a lua executable that knows about additional packages. let env = let - paths = requiredLuaModules (extraLibs ++ [ lua ] ); + paths = [ lua ] ++ requiredLuaModules extraLibs; in buildEnv { name = "${lua.name}-env"; |