[gnome-builder] plugins/flatpak: dont bind mount wayland socket



commit 66fd97f2a71be6b703bb337fb9cff66256f16fd5
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jul 13 15:58:17 2022 -0700

    plugins/flatpak: dont bind mount wayland socket
    
    This doesn't seem to be working anymore, so just #if 0 it for now until
    we know more about what is going on.

 src/plugins/flatpak/gbp-flatpak-runtime.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime.c b/src/plugins/flatpak/gbp-flatpak-runtime.c
index 5f5a6c2e4..901e655ef 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime.c
@@ -163,7 +163,6 @@ gbp_flatpak_runtime_handle_run_context_cb (IdeRunContext       *run_context,
   g_autofree char *project_build_dir_arg = NULL;
   g_autofree char *project_build_dir = NULL;
   g_autofree char *staging_dir = NULL;
-  const char *wayland_display;
   const char *app_id;
   IdeContext *context;
   IdeConfig *config;
@@ -211,11 +210,17 @@ gbp_flatpak_runtime_handle_run_context_cb (IdeRunContext       *run_context,
                                     "--bind-mount=/run/user/%u/doc=/run/user/%u/doc/by-app/%s",
                                     getuid (), getuid (), app_id);
 
-  /* Make sure wayland socket is available. */
-  if ((wayland_display = g_getenv ("WAYLAND_DISPLAY")))
-    ide_run_context_append_formatted (run_context,
-                                      "--bind-mount=/run/user/%u/%s=/run/user/%u/%s",
-                                      getuid (), wayland_display, getuid (), wayland_display);
+#if 0
+  {
+    const char *wayland_display;
+
+    /* Make sure wayland socket is available. */
+    if ((wayland_display = g_getenv ("WAYLAND_DISPLAY")))
+      ide_run_context_append_formatted (run_context,
+                                        "--bind-mount=/run/user/%u/%s=/run/user/%u/%s",
+                                        getuid (), wayland_display, getuid (), wayland_display);
+  }
+#endif
 
   /* Make sure we have access to fonts and such */
   gbp_flatpak_aux_append_to_run_context (run_context);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]