diff options
Diffstat (limited to 'maintainers/scripts/update-luarocks-packages')
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index 73a233c5f103..cab63ca44e38 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -31,7 +31,7 @@ from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" -LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" +LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua" HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! Regenerate it with: @@ -158,14 +158,14 @@ def generate_pkg_nix(plug: LuaPlugin): Our cache key associates "p.name-p.version" to its rockspec ''' log.debug("Generating nix expression for %s", plug.name) - cmd = [ "luarocks", "nix"] + custom_env = os.environ.copy() + custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG + cmd = [ "luarocks", "nix"] if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") - # updates plugin directly from its repository - print("server: [%s]" % plug.server) # if plug.server == "src": if plug.src != "": if plug.src is None: @@ -194,7 +194,8 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(f"--lua-dir={lua_drv_path}/bin") log.debug("running %s", ' '.join(cmd)) - output = subprocess.check_output(cmd, text=True) + + output = subprocess.check_output(cmd, env=custom_env, text=True) output = "callPackage(" + output.strip() + ") {};\n\n" return (plug, output) |