diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-03-12 11:20:16 -0500 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-03-12 11:20:16 -0500 |
| commit | 3ba283d9350783c038cc2844450f4938ad125f08 (patch) | |
| tree | 8ba8ac306bbf45b0b30b85bd4db1557145e4c558 /docker/build-inner.sh | |
| parent | 1a32fc8cb914050ed9417b5c4c1c30d8b2778d8a (diff) | |
Upgrade bundled Qt from 6.9 to 6.10 via aqtinstall
NixOS/Arch users have Qt 6.10 system-wide, causing Qt_6.10 symbol errors
when loading mobase.so against the bundled Qt 6.9. Switch Docker build to
install Qt 6.10.2 from aqtinstall instead of Ubuntu's Qt 6.9 packages.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'docker/build-inner.sh')
| -rwxr-xr-x | docker/build-inner.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docker/build-inner.sh b/docker/build-inner.sh index 42cb45d..0f6fcdb 100755 --- a/docker/build-inner.sh +++ b/docker/build-inner.sh @@ -160,8 +160,18 @@ rm -f "${ALL_DEPS}" echo "Dependencies bundled." # ── Qt6 platform plugins ── -QT6_PLUGIN_DIR="/usr/lib/x86_64-linux-gnu/qt6/plugins" -if [ ! -d "${QT6_PLUGIN_DIR}" ]; then +# Prefer aqtinstall location (Docker), then system, then qtpaths6 fallback. +QT6_PLUGIN_DIR="" +for _candidate in \ + "${Qt6_DIR:-}/plugins" \ + "/opt/qt6/6.10.2/gcc_64/plugins" \ + "/usr/lib/x86_64-linux-gnu/qt6/plugins"; do + if [ -d "${_candidate}" ]; then + QT6_PLUGIN_DIR="${_candidate}" + break + fi +done +if [ -z "${QT6_PLUGIN_DIR}" ]; then QT6_PLUGIN_DIR="$(qtpaths6 --plugin-dir 2>/dev/null || echo "")" fi if [ -d "${QT6_PLUGIN_DIR}" ]; then |