mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-29 22:20:21 +00:00
fix(nvidia): Do not apply flatpak overrides to hybrid systems
chore(nvidia) Apply overrides prior to flatpak installs to ensure Firefox is ready to use the moment it's installed.
This commit is contained in:
parent
cc5d25766d
commit
d9ef9ec33a
@ -38,6 +38,37 @@ FLATPAK_LIST=$(flatpak list --columns=application)
|
||||
INSTALL_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/install"
|
||||
REMOVE_LIST_FILE="/usr/share/ublue-os/bazzite/flatpak/remove"
|
||||
|
||||
# Configure needed params for flatpaks
|
||||
flatpak override \
|
||||
--system \
|
||||
--env=MOZ_ENABLE_WAYLAND=1 \
|
||||
--env=MOZ_USE_XINPUT2=1 \
|
||||
org.mozilla.firefox
|
||||
|
||||
# Params needed for HW accelerated video on Nvidia (Ignoring hybrid systems)
|
||||
if [[ $IMAGE_FLAVOR =~ "nvidia" ]] && [ $(grep -o "\-display" <<< $(lshw -C display) | wc -l) -le 1 ]; then
|
||||
flatpak override \
|
||||
--system \
|
||||
--filesystem=host-os \
|
||||
--env=LIBVA_DRIVER_NAME=nvidia \
|
||||
--env=LIBVA_DRIVERS_PATH=/run/host/usr/lib64/dri \
|
||||
--env=LIBVA_MESSAGING_LEVEL=1 \
|
||||
--env=MOZ_DISABLE_RDD_SANDBOX=1 \
|
||||
--env=NVD_BACKEND=direct \
|
||||
org.mozilla.firefox
|
||||
else
|
||||
# Undo if user was previously using a Nvidia image and is no longer
|
||||
flatpak override \
|
||||
--system \
|
||||
--nofilesystem=host-os \
|
||||
--unset-env=LIBVA_DRIVER_NAME \
|
||||
--unset-env=LIBVA_DRIVERS_PATH \
|
||||
--unset-env=LIBVA_MESSAGING_LEVEL \
|
||||
--unset-env=MOZ_DISABLE_RDD_SANDBOX \
|
||||
--unset-env=NVD_BACKEND \
|
||||
org.mozilla.firefox
|
||||
fi
|
||||
|
||||
# Install flatpaks in list
|
||||
if [[ -f $INSTALL_LIST_FILE ]]; then
|
||||
if [[ -n $FLATPAK_LIST ]]; then
|
||||
@ -61,37 +92,6 @@ if [[ ! -f $VER_FILE && -f $REMOVE_LIST_FILE ]]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# Configure needed params for flatpaks
|
||||
flatpak override \
|
||||
--system \
|
||||
--env=MOZ_ENABLE_WAYLAND=1 \
|
||||
--env=MOZ_USE_XINPUT2=1 \
|
||||
org.mozilla.firefox
|
||||
|
||||
# Params needed for HW accelerated video on Nvidia
|
||||
if [[ $IMAGE_FLAVOR =~ "nvidia" ]]; then
|
||||
flatpak override \
|
||||
--system \
|
||||
--filesystem=host-os \
|
||||
--env=LIBVA_DRIVER_NAME=nvidia \
|
||||
--env=LIBVA_DRIVERS_PATH=/run/host/usr/lib64/dri \
|
||||
--env=LIBVA_MESSAGING_LEVEL=1 \
|
||||
--env=MOZ_DISABLE_RDD_SANDBOX=1 \
|
||||
--env=NVD_BACKEND=direct \
|
||||
org.mozilla.firefox
|
||||
else
|
||||
# Undo if user was previously using a Nvidia image and is no longer
|
||||
flatpak override \
|
||||
--system \
|
||||
--nofilesystem=host-os \
|
||||
--unset-env=LIBVA_DRIVER_NAME \
|
||||
--unset-env=LIBVA_DRIVERS_PATH \
|
||||
--unset-env=LIBVA_MESSAGING_LEVEL \
|
||||
--unset-env=MOZ_DISABLE_RDD_SANDBOX \
|
||||
--unset-env=NVD_BACKEND \
|
||||
org.mozilla.firefox
|
||||
fi
|
||||
|
||||
mkdir -p /etc/bazzite
|
||||
echo $VER > $VER_FILE
|
||||
echo $IMAGE_FLAVOR > $KNOWN_IMAGE_FLAVOR_FILE
|
||||
|
Loading…
x
Reference in New Issue
Block a user