3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/development/tools/godot/dont_clobber_environment.patch

20 lines
745 B
Diff
Raw Normal View History

2020-07-07 21:17:58 +01:00
diff --git a/SConstruct b/SConstruct
index d138c7b250..c925bf908e 100644
2020-07-07 21:17:58 +01:00
--- a/SConstruct
+++ b/SConstruct
@@ -65,10 +65,10 @@ elif platform_arg == "javascript":
# want to have to pull in manually.
# Then we prepend PATH to make it take precedence, while preserving SCons' own entries.
env_base = Environment(tools=custom_tools)
-env_base.PrependENVPath("PATH", os.getenv("PATH"))
-env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
-if "TERM" in os.environ: # Used for colored output.
2020-07-07 21:17:58 +01:00
- env_base["ENV"]["TERM"] = os.environ["TERM"]
+for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
+ if (k in os.environ):
+ env_base["ENV"][k] = os.environ[k]
+
2020-02-12 23:27:23 +00:00
env_base.disabled_modules = []
env_base.use_ptrcall = False