about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/tools/godot/3/patches/SConstruct/dontClobberEnvironment.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/tools/godot/3/patches/SConstruct/dontClobberEnvironment.patch')
-rw-r--r--nixpkgs/pkgs/development/tools/godot/3/patches/SConstruct/dontClobberEnvironment.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/tools/godot/3/patches/SConstruct/dontClobberEnvironment.patch b/nixpkgs/pkgs/development/tools/godot/3/patches/SConstruct/dontClobberEnvironment.patch
new file mode 100644
index 000000000000..d72d7ed11527
--- /dev/null
+++ b/nixpkgs/pkgs/development/tools/godot/3/patches/SConstruct/dontClobberEnvironment.patch
@@ -0,0 +1,20 @@
+diff --git a/SConstruct b/SConstruct
+index 057ec7628c..760be89fff 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -67,14 +67,7 @@ elif platform_arg == "javascript":
+ elif os.name == "nt" and methods.get_cmdline_bool("use_mingw", False):
+     custom_tools = ["mingw"]
+ 
+-# We let SCons build its default ENV as it includes OS-specific things which we don't
+-# 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.
+-    env_base["ENV"]["TERM"] = os.environ["TERM"]
++env_base = Environment(ENV = os.environ, tools=custom_tools)
+ 
+ env_base.disabled_modules = []
+ env_base.use_ptrcall = False