summaryrefslogtreecommitdiff
path: root/snap
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2025-01-24 13:57:30 +0200
committerMitchell Hashimoto <m@mitchellh.com>2025-02-15 07:06:40 -0800
commite4cf81c2ba8662d02937a5e087b12712d77ffe41 (patch)
tree74f6e3c11d2ebcb70f6274efe54128794962e41e /snap
parentcb5379ab1d452df758bd508f4ecd0fe03d0fe426 (diff)
Clean up environment variable while launching the shell
Diffstat (limited to 'snap')
-rwxr-xr-xsnap/local/launcher3
-rw-r--r--snap/snapcraft.yaml1
2 files changed, 1 insertions, 3 deletions
diff --git a/snap/local/launcher b/snap/local/launcher
index 6b5b69fa6..c0f204060 100755
--- a/snap/local/launcher
+++ b/snap/local/launcher
@@ -30,7 +30,6 @@ export VK_LAYER_PATH=${VK_LAYER_PATH:+$VK_LAYER_PATH:}${SNAP}/usr/share/vulkan/i
export XDG_DATA_DIRS=${XDG_DATA_DIRS:+$XDG_DATA_DIRS:}${SNAP}/usr/share
export XLOCALEDIR="${SNAP}/usr/share/X11/locale"
-export LIBGL_DRIVERS_PATH
if [ "${__NV_PRIME_RENDER_OFFLOAD:-}" != 1 ]; then
# Prevent picking VA-API (Intel/AMD) over NVIDIA VDPAU
# https://download.nvidia.com/XFree86/Linux-x86_64/510.54/README/primerenderoffload.html#configureapplications
@@ -39,7 +38,7 @@ fi
# Unset all SNAP specific environment variables to keep them from leaking
# into other snaps that might get executed from within the shell
-for var in $(printenv | grep SNAP | cut -d= -f1); do
+for var in $(printenv | grep SNAP_ | cut -d= -f1); do
unset $var
done
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 2b4f4a825..a27f35e45 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -95,7 +95,6 @@ parts:
- libsensors5
- libllvm17
- libunistring5
- - gnome-text-editor # Needed for config editor
- on amd64: [i965-va-driver,libdrm-intel1,libdrm-nouveau2,libdrm-amdgpu1,libdrm-radeon1]
stage:
# The libraries in dri need no-patchelf, so they come from the mesa-unpatched part