Enable use of lua-bz2

Fixes #1005.

2 files changed, 4 insertions, 2 deletions

diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 9ff0a470..e3aad1b1 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -650,6 +650,7 @@ function test_env.setup_specs(extra_rocks)
       require("spec.util.git_repo")
 
       package.path = test_env.env_variables.LUA_PATH
+      package.cpath = test_env.env_variables.LUA_CPATH
 
       test_env.platform = execute_output(test_env.testing_paths.lua .. " -e \"cfg = require('luarocks.core.cfg'); cfg.init(); print(cfg.arch)\"", false, test_env.env_variables)
       test_env.wrapper_extension = test_env.TEST_TARGET_OS == "windows" and ".bat" or ""
@@ -918,7 +919,8 @@ function test_env.main()
       table.insert(urls, "/md5-1.2-1.src.rock")
       --table.insert(urls, "/lzlib-0.4.1.53-1.src.rock")
       table.insert(urls, "/lua-zlib-1.2-0.src.rock")
-      rocks = {"luafilesystem", "luasocket", "md5", "lua-zlib"}
+      table.insert(urls, "/lua-bz2-0.1.0-1.src.rock")
+      rocks = {"luafilesystem", "luasocket", "md5", "lua-zlib", "lua-bz2"}
       if test_env.TEST_TARGET_OS ~= "windows" then
          table.insert(urls, "/luaposix-33.2.1-1.src.rock")
          table.insert(rocks, "luaposix")
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua
index b589654f..56583676 100644
--- a/src/luarocks/fs/lua.lua
+++ b/src/luarocks/fs/lua.lua
@@ -17,7 +17,7 @@ if cfg.fs_use_modules then
    socket_ok, http = pcall(require, "socket.http")
    _, ftp = pcall(require, "socket.ftp")
    zip_ok, zip = pcall(require, "luarocks.tools.zip")
-   bz2_ok, bz2 = pcall(require, "luarocks.tools.bzip2")
+   bz2_ok, bz2 = pcall(require, "bz2")
    lfs_ok, lfs = pcall(require, "lfs")
    md5_ok, md5 = pcall(require, "md5")
    posix_ok, posix = pcall(require, "posix")