[gedit/gnome-3-30] snap: Updated layout to use libpeas from gnome-platform

[Ken VanDine <kvandine src gnome org>]

commit 207d0a6926ae95b3c94963d5ca49efae2ecd5884
Author: Ken VanDine <ken vandine canonical com>
Date:   Wed Feb 6 14:28:30 2019 -0500

    snap: Updated layout to use libpeas from gnome-platform

 snap/snapcraft.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6f2987fc7..5fa166200 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -45,7 +45,11 @@ slots:
 passthrough:
   layout:
     /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libpeas-1.0:
-      symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libpeas-1.0
+      symlink: $SNAP/gnome-platform/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libpeas-1.0
+    /usr/lib/$SNAPCRAFT_ARCH_TRIPLET/gedit:
+      symlink: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/gedit
+    /usr/share/gedit:
+      symlink: $SNAP/usr/share/gedit
 
 apps:
   gedit:
@@ -126,7 +130,9 @@ parts:
     organize:
       snap/gedit-plugins/current/usr: usr
     build-environment:
-      - C_INCLUDE_PATH: $SNAPCRAFT_STAGE/usr/include/gedit-3.14/
+      - C_INCLUDE_PATH: $SNAPCRAFT_STAGE/usr/include:$SNAPCRAFT_STAGE/usr/include/gedit-3.14
+      - LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/gedit
+      - PKG_CONFIG_PATH: $PKG_CONFIG_PATH:$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig
     build-packages:
       - build-essential
       - gettext