nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch

19 lines
691 B
Diff
Raw Normal View History

2020-07-07 22:17:58 +02:00
diff --git a/SConstruct b/SConstruct
index b3d033dc90..04b8dcc832 100644
--- a/SConstruct
+++ b/SConstruct
@@ -62,10 +62,9 @@ elif platform_arg == "javascript":
custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
env_base = Environment(tools=custom_tools)
2020-07-07 22:17:58 +02:00
-if "TERM" in os.environ:
- env_base["ENV"]["TERM"] = os.environ["TERM"]
-env_base.AppendENVPath("PATH", os.getenv("PATH"))
-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
+ if (k in os.environ):
+ env_base["ENV"][k] = os.environ[k]
2020-02-13 00:27:23 +01:00
env_base.disabled_modules = []
env_base.use_ptrcall = False
env_base.module_version_string = ""