From dc71943a7b2765a59887e72e8b7805121115ab28 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Wed, 9 Sep 2020 18:47:28 +0100
Subject: [PATCH] Revert "runtime: Set STEAM_RUNTIME=/ if running in scout"

Setting STEAM_RUNTIME=/ causes configuration changes in libraries like
Pango and GTK, which break module loading when not in the
LD_LIBRARY_PATH Steam Runtime. We will need to update those libraries'
search paths before we can do this.

This reverts commit eb7166980fb1e6f7e7945674c0556bc864056f65.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 src/runtime.c           | 10 ----------
 tests/inside-runtime.py |  6 +-----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/runtime.c b/src/runtime.c
index 365cf559f..06cba7506 100644
--- a/src/runtime.c
+++ b/src/runtime.c
@@ -3225,16 +3225,6 @@ pv_runtime_bind (PvRuntime *self,
       self->adverb_in_container = "/run/pressure-vessel/pv-from-host/bin/pressure-vessel-adverb";
     }
 
-  /* Some games detect that they have been run outside the Steam Runtime
-   * and try to re-run themselves via Steam. Trick them into thinking
-   * they are in the LD_LIBRARY_PATH Steam Runtime.
-   *
-   * We do not do this for games developed against soldier, because
-   * backwards compatibility is not a concern for game developers who
-   * have specifically opted-in to using the newer runtime. */
-  if (self->is_scout)
-    flatpak_bwrap_set_env (bwrap, "STEAM_RUNTIME", "/", TRUE);
-
   pv_runtime_set_search_paths (self, bwrap);
 
   return TRUE;
diff --git a/tests/inside-runtime.py b/tests/inside-runtime.py
index 97ee4292c..cb83c29d2 100755
--- a/tests/inside-runtime.py
+++ b/tests/inside-runtime.py
@@ -153,11 +153,7 @@ class TestInsideRuntime(BaseTest):
         logger.info(
             'LD_LIBRARY_PATH: %r', os.environ.get('LD_LIBRARY_PATH')
         )
-
-        if os.environ.get('TEST_INSIDE_RUNTIME_IS_SCOUT'):
-            self.assertEqual(os.environ.get('STEAM_RUNTIME'), '/')
-        elif os.environ.get('TEST_INSIDE_RUNTIME_IS_SOLDIER'):
-            self.assertEqual(os.environ.get('STEAM_RUNTIME'), None)
+        # No actual *tests* here just yet - we just log what's there.
 
     def test_overrides(self) -> None:
         if os.getenv('TEST_INSIDE_RUNTIME_IS_COPY'):
-- 
GitLab