Merge pull request lutris#146 from Ryochan7/master

Use envvar for disabling Lutris runtime
malkavi · Dec 15, 2014 · 40dd5ad · 40dd5ad
2 parents ffa69d4 + 7257135
commit 40dd5ad
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lutris/game.py b/lutris/game.py
@@ -145,12 +145,14 @@ def play(self):
             launch_arguments.insert(0, 'LD_PRELOAD="{}"'.format(ld_preload))
 
         ld_library_path = []
-        runtime64_path = os.path.join(settings.RUNTIME_DIR, "lib64")
-        if os.path.exists(runtime64_path):
-            ld_library_path.append(runtime64_path)
-        runtime32_path = os.path.join(settings.RUNTIME_DIR, "lib32")
-        if os.path.exists(runtime32_path):
-            ld_library_path.append(runtime32_path)
+        if os.getenv("LUTRIS_RUNTIME", 1) == 1:
+            runtime64_path = os.path.join(settings.RUNTIME_DIR, "lib64")
+            if os.path.exists(runtime64_path):
+                ld_library_path.append(runtime64_path)
+            runtime32_path = os.path.join(settings.RUNTIME_DIR, "lib32")
+            if os.path.exists(runtime32_path):
+                ld_library_path.append(runtime32_path)
+
         game_ld_libary_path = gameplay_info.get('ld_library_path')
         if game_ld_libary_path:
             ld_library_path.append(game_ld_libary_path)