diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2025-02-14 18:14:06 -0500 |
|---|---|---|
| committer | Mitchell Hashimoto <m@mitchellh.com> | 2025-02-15 07:06:40 -0800 |
| commit | d3623393a68e2e7f240cccbd7fbac9d75a2bbb44 (patch) | |
| tree | 0c4a79f0b8ba6a177bc74b476cc5c08eef7265d3 | |
| parent | 2adee4290a2c57fe9cc7a9a60e6bc82ced908b39 (diff) | |
More environment handling to ensure reliability across distros
| -rwxr-xr-x | snap/local/launcher | 9 | ||||
| -rw-r--r-- | src/termio/Exec.zig | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/snap/local/launcher b/snap/local/launcher index c0f204060..11597f238 100755 --- a/snap/local/launcher +++ b/snap/local/launcher @@ -6,6 +6,10 @@ if [ -z "$XDG_CONFIG_HOME" ]; then export XDG_CONFIG_HOME="$SNAP_REAL_HOME/.config" fi +if [ -z "$XDG_CACHE_HOME" ]; then + export XDG_CACHE_HOME="$SNAP_REAL_HOME/.cache" +fi + if [ -z "$XDG_DATA_HOME" ]; then export XDG_DATA_HOME="$SNAP_REAL_HOME/.local/share" fi @@ -20,7 +24,7 @@ else ARCH="$SNAP_ARCH-linux-gnu" fi -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${SNAP}/usr/lib/${ARCH}:${SNAP}/usr/lib/${ARCH}/vdpau +export LD_LIBRARY_PATH=${SNAP}/usr/lib/${ARCH}:${SNAP}/usr/lib/${ARCH}/vdpau:${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:} export LIBGL_DRIVERS_PATH=${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}${SNAP}/usr/lib/${ARCH}/dri/ export LIBVA_DRIVERS_PATH=${LIBVA_DRIVERS_PATH:+$LIBVA_DRIVERS_PATH:}${SNAP}/usr/lib/${ARCH}/dri/ export __EGL_VENDOR_LIBRARY_DIRS=${__EGL_VENDOR_LIBRARY_DIRS:+$__EGL_VENDOR_LIBRARY_DIRS:}${SNAP}/usr/share/glvnd/egl_vendor.d @@ -29,6 +33,9 @@ export DRIRC_CONFIGDIR=${SNAP}/usr/share/drirc.d export VK_LAYER_PATH=${VK_LAYER_PATH:+$VK_LAYER_PATH:}${SNAP}/usr/share/vulkan/implicit_layer.d/:${SNAP}/usr/share/vulkan/explicit_layer.d/ export XDG_DATA_DIRS=${XDG_DATA_DIRS:+$XDG_DATA_DIRS:}${SNAP}/usr/share export XLOCALEDIR="${SNAP}/usr/share/X11/locale" +export GDK_PIXBUF_MODULE_FILE="$XDG_CACHE_HOME/gdk-pixbuf-loaders.cache" +export GDK_PIXBUF_MODULEDIR="$SNAP/usr/lib/$ARCH/gdk-pixbuf-2.0/2.10.0/loaders" +export GTK_PATH="$SNAP/usr/lib/$ARCH/gtk-4.0" if [ "${__NV_PRIME_RENDER_OFFLOAD:-}" != 1 ]; then # Prevent picking VA-API (Intel/AMD) over NVIDIA VDPAU diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig index 39e5569ea..026b48f7f 100644 --- a/src/termio/Exec.zig +++ b/src/termio/Exec.zig @@ -744,6 +744,9 @@ const Subprocess = struct { env.remove("LIBVA_DRIVERS_PATH"); env.remove("VK_LAYER_PATH"); env.remove("XLOCALEDIR"); + env.remove("GDK_PIXBUF_MODULEDIR"); + env.remove("GDK_PIXBUF_MODULE_FILE"); + env.remove("GTK_PATH"); } // Set our TERM var. This is a bit complicated because we want to use |