Commit a4d95408 authored by Matthieu C.'s avatar Matthieu C.
Browse files

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.
parent 98661281

pkgs/development/interpreters/lua-5/build-luarocks-package.nix

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ let 
  generatedRockspecFilename = "./${self.pname}-${self.rockspecVersion}.rockspec";



  nativeBuildInputs = [

    lua  # for lua.h

    wrapLua

    luarocks

  ];

pkgs/development/interpreters/lua-5/wrapper.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";

pkgs/development/lua-modules/overrides.nix

+2 −1
Original line number Diff line number Diff line
@@ -641,7 +641,8 @@ in 
      tar xf *.tar.gz

    '';



    propagatedBuildInputs = [ lua luaposix

    propagatedBuildInputs = [

      luaposix

      readline.out

    ];