diff options
| author | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-06-17 01:46:09 -0500 |
|---|---|---|
| committer | SulfurNitride <SulfurNitride@users.noreply.github.com> | 2026-06-17 01:46:09 -0500 |
| commit | 05aa96d20ca726908a7d8b1943f86f0c4e11bf18 (patch) | |
| tree | bd45913d1c7a033088f3456e40c8b44c72818ace /docker | |
| parent | 30d2c801a01eeb140ddd5adf8676f2626ecff3fa (diff) | |
Prepare Nexus-safe release cleanup
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 11 | ||||
| -rwxr-xr-x | docker/build-inner.sh | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index c721021..376f711 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,8 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libtinyxml2-dev \ libfontconfig1-dev \ libspdlog-dev \ - libfuse3-dev fuse3 libcap-dev \ - liburing-dev libnuma-dev \ + libfuse3-dev fuse3 libcap-dev libnuma-dev \ liblz4-dev zlib1g-dev libzstd-dev libbz2-dev liblzma-dev \ libssl-dev libcurl4-openssl-dev \ libtomlplusplus-dev \ @@ -40,9 +39,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ clang-tidy \ && rm -rf /var/lib/apt/lists/* -# Ubuntu 25.10 currently carries libfuse 3.17.x, which cannot mount with -# the stable FUSE-over-io_uring option. Build the pinned upstream release -# so Fluorine compiles and bundles matching 3.18.x headers/runtime. +# Build a pinned upstream libfuse so Fluorine compiles and bundles matching +# headers/runtime across supported build images. ARG LIBFUSE_VERSION=3.18.2 RUN curl -L --fail \ "https://github.com/libfuse/libfuse/releases/download/fuse-${LIBFUSE_VERSION}/fuse-${LIBFUSE_VERSION}.tar.gz" \ @@ -54,8 +52,7 @@ RUN curl -L --fail \ -Dexamples=false \ -Dutils=true \ -Dtests=false \ - -Duseroot=false \ - -Denable-io-uring=true && \ + -Duseroot=false && \ meson compile -C /tmp/libfuse-build && \ meson install -C /tmp/libfuse-build && \ ldconfig && \ diff --git a/docker/build-inner.sh b/docker/build-inner.sh index 3cc5559..135ffff 100755 --- a/docker/build-inner.sh +++ b/docker/build-inner.sh @@ -68,7 +68,6 @@ cp -f "${RUNDIR}/ModOrganizer" "${OUT_DIR}/ModOrganizer-core" find build/libs -type f \( \ -name "libgame_*.so" -o \ -name "libinstaller_*.so" -o \ - -name "libfomod_plus_*.so" -o \ -name "libpreview_*.so" -o \ -name "libdiagnose_*.so" -o \ -name "libcheck_*.so" -o \ @@ -482,9 +481,8 @@ export FLUORINE_ORIG_PATH="${PATH}" export FLUORINE_ORIG_XDG_DATA_DIRS="${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" export FLUORINE_ORIG_QT_PLUGIN_PATH="${QT_PLUGIN_PATH:-}" -# Steam injects 32-bit gameoverlayrenderer.so via LD_PRELOAD which causes -# "wrong ELF class" errors for 64-bit Qt6 apps (see PrismLauncher #3421). -# Clear it for our process; game launches restore via FLUORINE_ORIG_LD_PRELOAD. +# Clear any injected preload for the bundled Qt6 process. Game launches restore +# the original value via FLUORINE_ORIG_LD_PRELOAD. unset LD_PRELOAD # Suppress Qt debug logging by default. Some plugins (e.g. BG3 file mapper) |