public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

godot: stop build process from looking in global directories

Browse Source
This commit is contained in:
James Kay 2018-02-21 12:23:11 +00:00
parent 2b96b03333
commit 7ba969f87e
No known key found for this signature in database
GPG Key ID: 76BE7F17BF11AD15
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/tools/godot/default.nix
View File

@ -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;

16
pkgs/development/tools/godot/dont_clobber_environment.patch Normal file
View File

@ -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 = []