From 87fab0c74725fa43cfeff62c6c17274d5586e55e Mon Sep 17 00:00:00 2001
From: Ikey Doherty <ikey@solus-project.com>
Date: Mon, 13 Nov 2017 01:35:46 +0000
Subject: [PATCH] shim: Prepare for `gl32` snapd paths

Signed-off-by: Ikey Doherty <ikey@solus-project.com>
---
 src/shim/shim.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/shim/shim.c b/src/shim/shim.c
index a25e86c..a89fb3f 100644
--- a/src/shim/shim.c
+++ b/src/shim/shim.c
@@ -200,11 +200,14 @@ static void shim_export_extra(const char *prefix)
          * This allows us to handle the special-case multiarch mounts.
          */
         static const char *ld_library_dirs[] = {
-                "/var/lib/snapd/lib/gl/vdpau",     /**<Multiarch specific */
+                "/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 */
+                "/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) */
         };
 
         /* Add any necessary DRI drivers to the path, though in reality this