From f239df59caca2034eb98b3f90f6878e6384d1d0c Mon Sep 17 00:00:00 2001
From: Ken VanDine <ken.vandine@canonical.com>
Date: Fri, 24 Jan 2025 13:57:30 +0200
Subject: [PATCH] Clean up environment variable while launching the shell

---
 snap/local/launcher | 3 +--
 snap/snapcraft.yaml | 1 -
 2 files changed, 1 insertion(+), 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