github-mirrors/netris-nestri
1
0
Fork 0
mirror of https://github.com/nestriness/nestri.git synced 2025-12-11 00:05:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes and update gst-wayland-display

Browse Source
This commit is contained in:
DatCaptainHorse
2025-11-20 15:35:03 +02:00
parent 586b9f1a13
commit 6f491a3a4c
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
containerfiles/runner-builder.Containerfile
View File

@@ -28,7 +28,7 @@ RUN rustup default stable
# Install cargo-chef with proper caching # Install cargo-chef with proper caching
RUN --mount=type=cache,target=${CARGO_HOME}/registry \ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
cargo install -j $(nproc) cargo-chef --locked cargo install cargo-chef --locked
#*******************************# #*******************************#
# vimputti manager build stages # # vimputti manager build stages #
@@ -130,7 +130,7 @@ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
cargo install cargo-c cargo install cargo-c
# Clone repository # Clone repository
RUN git clone --depth 1 --rev "dadf6bf3a3a49cc07a0e3d644f48233e29449db4" https://github.com/games-on-whales/gst-wayland-display.git RUN git clone --depth 1 --rev "e4c70b64dad3cd8bbf5eec011f419386adf737ee" https://github.com/games-on-whales/gst-wayland-display.git
#-------------------------------------------------------------------- #--------------------------------------------------------------------
FROM gst-wayland-deps AS gst-wayland-planner FROM gst-wayland-deps AS gst-wayland-planner
@@ -148,7 +148,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/recipe.json .
# Cache dependencies using cargo-chef # Cache dependencies using cargo-chef
RUN --mount=type=cache,target=${CARGO_HOME}/registry \ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
cargo chef cook --release --recipe-path recipe.json cargo chef cook --release --recipe-path recipe.json --features cuda
ENV CARGO_TARGET_DIR=/builder/target ENV CARGO_TARGET_DIR=/builder/target
@@ -158,7 +158,7 @@ COPY --from=gst-wayland-planner /builder/gst-wayland-display/ .
# Build and install directly to artifacts # Build and install directly to artifacts
RUN --mount=type=cache,target=${CARGO_HOME}/registry \ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
--mount=type=cache,target=/builder/target \ --mount=type=cache,target=/builder/target \
cargo cinstall --prefix=${ARTIFACTS} --release cargo cinstall --prefix=${ARTIFACTS} --release --features cuda
#*********************************# #*********************************#
# Patched bubblewrap build stages # # Patched bubblewrap build stages #

8
packages/scripts/entrypoint_nestri.sh
View File

@@ -108,7 +108,7 @@ start_compositor() {
# Set default compositor if unset # Set default compositor if unset
if [[ -z "${NESTRI_LAUNCH_COMPOSITOR+x}" ]]; then if [[ -z "${NESTRI_LAUNCH_COMPOSITOR+x}" ]]; then
NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt --mangoapp -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}" NESTRI_LAUNCH_COMPOSITOR="gamescope --backend wayland --force-grab-cursor -g -f --rt -W ${WIDTH} -H ${HEIGHT} -r ${FRAMERATE:-60}"
fi fi
# If PRELOAD_SHIM_arch's are set and exist, set LD_PRELOAD for 32/64-bit apps # If PRELOAD_SHIM_arch's are set and exist, set LD_PRELOAD for 32/64-bit apps
@@ -120,7 +120,7 @@ start_compositor() {
# Configure launch cmd with dbus if set # Configure launch cmd with dbus if set
local launch_cmd="" local launch_cmd=""
if [[ -n "${NESTRI_LAUNCH_CMD}" ]]; then if [[ -n "${NESTRI_LAUNCH_CMD+x}" ]]; then
if $do_ld_preload; then if $do_ld_preload; then
launch_cmd="LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' dbus-launch $NESTRI_LAUNCH_CMD" launch_cmd="LD_PRELOAD='/usr/\$LIB/libvimputti_shim.so' dbus-launch $NESTRI_LAUNCH_CMD"
else else
@@ -137,9 +137,9 @@ start_compositor() {
if [[ "$compositor_cmd" == *"gamescope"* ]]; then if [[ "$compositor_cmd" == *"gamescope"* ]]; then
is_gamescope=true is_gamescope=true
if [[ -n "$launch_cmd" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then if [[ -n "$launch_cmd" ]] && [[ "$compositor_cmd" != *" -- "* ]]; then
# If steam in launch command, enable gamescope integration via -e # If steam in launch command, enable gamescope integration via -e and enable mangohud
if [[ "$launch_cmd" == *"steam"* ]]; then if [[ "$launch_cmd" == *"steam"* ]]; then
compositor_cmd+=" -e" compositor_cmd+=" --mangoapp -e"
fi fi
compositor_cmd+=" -- bash -c $(printf %q "$launch_cmd")" compositor_cmd+=" -- bash -c $(printf %q "$launch_cmd")"
fi fi

2
packages/scripts/envs.sh
View File

@@ -4,8 +4,6 @@ export USER=${NESTRI_USER}
export LANG=${NESTRI_LANG} export LANG=${NESTRI_LANG}
export HOME=${NESTRI_HOME} export HOME=${NESTRI_HOME}
export XDG_RUNTIME_DIR=${NESTRI_XDG_RUNTIME_DIR} export XDG_RUNTIME_DIR=${NESTRI_XDG_RUNTIME_DIR}
export XDG_SESSION_TYPE=x11
export DISPLAY=:0
# Causes some setups to break # Causes some setups to break
export PROTON_NO_FSYNC=1 export PROTON_NO_FSYNC=1