mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-01 11:22:58 +00:00
20 lines
745 B
Diff
20 lines
745 B
Diff
diff --git a/SConstruct b/SConstruct
|
|
index d138c7b250..c925bf908e 100644
|
|
--- 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.
|
|
- 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]
|
|
+
|
|
|
|
env_base.disabled_modules = []
|
|
env_base.use_ptrcall = False
|