From 80603598af306c5fcbd4a107dd8cab694cc79629 Mon Sep 17 00:00:00 2001
From: Ikey Doherty <ikey@solus-project.com>
Date: Mon, 13 Nov 2017 03:46:24 +0000
Subject: [PATCH] Only use the new "gl32" location from now on, drop old guy

Signed-off-by: Ikey Doherty <ikey@solus-project.com>
---
 src/intercept/snapd.c | 6 +++---
 src/shim/shim.c       | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/intercept/snapd.c b/src/intercept/snapd.c
index 42f939c..5716265 100644
--- a/src/intercept/snapd.c
+++ b/src/intercept/snapd.c
@@ -53,8 +53,8 @@ static const char *libgl_target_table[] = {
         "/var/lib/snapd/lib/gl/libEGL.so.1",
 #else
         /* 32bit support */
-        "/var/lib/snapd/lib/gl/32/libGL.so.1",
-        "/var/lib/snapd/lib/gl/32/libEGL.so.1",
+        "/var/lib/snapd/lib/gl32/libGL.so.1",
+        "/var/lib/snapd/lib/gl32/libEGL.so.1",
 #endif
 };
 
@@ -124,7 +124,7 @@ bool lsi_override_snapd_nvidia(const char *name, const char **soname)
         nvidia_target_dir = "/var/lib/snapd/lib/gl";
 #else
         /* 32-bit libdir */
-        nvidia_target_dir = "/var/lib/snapd/lib/gl/32";
+        nvidia_target_dir = "/var/lib/snapd/lib/gl32";
 #endif
 
         /* Grab the link name */
diff --git a/src/shim/shim.c b/src/shim/shim.c
index ed54a8b..8137059 100644
--- a/src/shim/shim.c
+++ b/src/shim/shim.c
@@ -202,12 +202,10 @@ static void shim_export_extra(const char *prefix)
          */
         static const char *ld_library_dirs[] = {
                 "/var/lib/snapd/lib/gl/vdpau",     /**<64-bit vdpau */
-                "/var/lib/snapd/lib/gl/32/vdpau",  /**<32bit vdpau */
                 "/var/lib/snapd/lib/gl32/vdpau",   /**<32bit vdpau */
                 "/usr/lib/glx-provider/default",   /**<Solus mesa, 64-bit */
                 "/usr/lib32/glx-provider/default", /**<Solus mesa, 32bit */
                 "/var/lib/snapd/lib/gl",           /**<Potential host NVIDIA libraries */
-                "/var/lib/snapd/lib/gl/32", /**<Potential host NVIDIA 32-bit libraries (old location) */
                 "/var/lib/snapd/lib/gl32", /**<Potential host NVIDIA 32-bit libraries (new location) */
         };