diff options
| author | James Kay <james@hadean.com> | 2018-02-21 12:23:11 +0000 |
|---|---|---|
| committer | James Kay <james@hadean.com> | 2018-03-16 19:46:53 +0000 |
| commit | 7ba969f87e68cad7c813210e758cff0b2cdd4047 (patch) | |
| tree | fcb4111f99209bc6cf72795e5bebc2e818e1a5be | |
| parent | 2b96b03333e8d1c78c9ecd96df3182bd9c0b991d (diff) | |
| download | nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.tar nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.tar.gz nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.tar.bz2 nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.tar.lz nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.tar.xz nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.tar.zst nixpkgs-7ba969f87e68cad7c813210e758cff0b2cdd4047.zip | |
godot: stop build process from looking in global directories
| -rw-r--r-- | pkgs/development/tools/godot/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/tools/godot/dont_clobber_environment.patch | 16 |
2 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 395080c3da5..9b515511953 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -23,10 +23,13 @@ in stdenv.mkDerivation rec { buildInputs = [ gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender libXi libXext libXfixes freetype openssl alsaLib libpulseaudio - libGLU zlib + libGLU zlib yasm ]; - patches = [ ./pkg_config_additions.patch ]; + patches = [ + ./pkg_config_additions.patch + ./dont_clobber_environment.patch + ]; enableParallelBuilding = true; diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch new file mode 100644 index 00000000000..c57c85588a0 --- /dev/null +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -0,0 +1,16 @@ ++++ build/SConstruct +@@ -69,10 +69,10 @@ + custom_tools = ['mingw'] + + env_base = Environment(tools=custom_tools) +-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] ++ + env_base.global_defaults = global_defaults + env_base.android_maven_repos = [] + env_base.android_flat_dirs = [] |