[gnome-sdk-images] Fixup GStreamer stuff for multiarch

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 2fd08a663ecbafd6644d80a4c4ff0efc7cdde079
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Tue May 15 12:45:09 2018 -0500

    Fixup GStreamer stuff for multiarch

 org.gnome.Sdk.json.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 63a5f22..ad5b2d6 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -28,7 +28,7 @@
     },
     "finish-args": [
         "--env=GI_TYPELIB_PATH=/app/lib/girepository-1.0",
-        
"--env=GST_PLUGIN_SYSTEM_PATH=/app/lib/gstreamer-1.0:/usr/lib/extensions/gstreamer-1.0:/usr/lib/gstreamer-1.0",
+        
"--env=GST_PLUGIN_PATH=/app/lib/gstreamer-1.0:/usr/lib/@SDK_ARCH@-linux-gnu/extensions/gstreamer-1.0",
         "--env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/share",
         "--sdk=org.gnome.Sdk//@@SDK_BRANCH@@",
         "--runtime=org.gnome.Platform//@@SDK_BRANCH@@"
@@ -450,8 +450,8 @@
                 }
             ],
             "build-commands": [
-                /* We delete all the 1.10 plugins to avoid version mismatches with renamed or removed 
plugins */
-                "rm -rf /usr/lib/gstreamer-1.0"
+                /* We delete all the overlapping freedesktop SDK plugins to avoid version mismatches with 
renamed or removed plugins */
+                "rm -rf /usr/lib/*/gstreamer-1.0"
             ]
         },
         {