diff options
| author | SulfurNitride <lukew19@proton.me> | 2026-05-16 12:56:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-16 12:56:34 -0500 |
| commit | fa0579c7f5703aba9669f7f41900c67e9759fca0 (patch) | |
| tree | f68c7674a3d433d6f9233ad9520a41a634c6bad7 /docker | |
| parent | 95a7f6bc85ec5695388def1ccfd785a631d3958b (diff) | |
| parent | a09fb2fbefba58faa0b50eb15dd46945ca288294 (diff) | |
Merge pull request #78 from saghm/larian-formats
Replace LsLib via proton with native larian-formats Python package
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/build-inner.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 13a67d5..c9952ad 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -71,7 +71,7 @@ ENV PATH="/opt/python-bundled/bin:${PATH}" # ── Build-time Python packages ── # pybind11/sip/etc. for compiling mobase.so; PyQt6 is staged into the distribution. RUN /opt/python-bundled/bin/pip3 install --no-cache-dir \ - pybind11==2.13.6 sip psutil vdf "PyQt6>=6.10,<6.11" + pybind11==2.13.6 sip psutil larian-formats==0.8.1 vdf "PyQt6>=6.10,<6.11" # ── Rust toolchain ── RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | \ diff --git a/docker/build-inner.sh b/docker/build-inner.sh index cd6c3e1..865e0b4 100755 --- a/docker/build-inner.sh +++ b/docker/build-inner.sh @@ -289,7 +289,7 @@ rm -f "${PYTHON_OUT}/lib/python3.12/turtle.py" rm -rf "${PYTHON_OUT}/lib/python3.12/site-packages" mkdir -p "${PYTHON_OUT}/lib/python3.12/site-packages" # Copy runtime-required packages back in -for pkg in psutil vdf; do +for pkg in psutil vdf larian_formats; do pkg_dir="$("${PBS_SRC}/bin/python3" -c "import importlib.util; s=importlib.util.find_spec('${pkg}'); print(s.submodule_search_locations[0] if s and s.submodule_search_locations else (s.origin if s else ''))" 2>/dev/null || true)" if [ -d "${pkg_dir}" ]; then cp -a "${pkg_dir}" "${PYTHON_OUT}/lib/python3.12/site-packages/" |