[gnome-builder/wip/gtk4-port] libide/foundry: fix passing of environment variables

[Christian Hergert <chergert src gnome org>]

commit 3a6c60fdba8647efbff5cbf3c4893978cbde3854
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jun 22 21:21:42 2022 -0700

    libide/foundry: fix passing of environment variables
    
    This has to happen after the expansion layer or we lose it.

 src/libide/foundry/ide-run-manager.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/libide/foundry/ide-run-manager.c b/src/libide/foundry/ide-run-manager.c
index 578b146f7..0a46f3a05 100644
--- a/src/libide/foundry/ide-run-manager.c
+++ b/src/libide/foundry/ide-run-manager.c
@@ -777,11 +777,6 @@ ide_run_manager_prepare_run_context (IdeRunManager *self,
   if (self->handler && self->handler->handler)
     self->handler->handler (self, run_context, self->handler->handler_data);
 
-  /* First we need to setup our basic runtime envronment so that we can be
-   * reasonably certain the application can access the desktop session.
-   */
-  setup_basic_environment (run_context);
-
   /* Now push a new layer so that we can keep those values separate from
    * what is configured in the run command. We use an expansion layer so
    * that we can expand common variables at this layer and not allow them
@@ -793,6 +788,11 @@ ide_run_manager_prepare_run_context (IdeRunManager *self,
   environ = g_environ_setenv (environ, "USER", g_get_user_name (), TRUE);
   ide_run_context_push_expansion (run_context, (const char * const *)environ);
 
+  /* First we need to setup our basic runtime envronment so that we can be
+   * reasonably certain the application can access the desktop session.
+   */
+  setup_basic_environment (run_context);
+
   /* Setup working directory */
   {
     const char *cwd = ide_run_command_get_cwd (run_command);