diff options
| author | Aaron Andersen <aaron@fosslib.net> | 2020-03-06 06:21:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 06:21:48 -0500 |
| commit | 7218f3a791cf1e0170a729026020804deb7500a6 (patch) | |
| tree | abbf9abc976dc29497313ef544c580dbe220ad4f /pkgs/development/tools | |
| parent | dc706339130d34ccb7ce28ca22a496a417f476ea (diff) | |
| parent | cf8bb29287789bac582bffa3ddfda422eed2dac6 (diff) | |
| download | nixlib-7218f3a791cf1e0170a729026020804deb7500a6.tar nixlib-7218f3a791cf1e0170a729026020804deb7500a6.tar.gz nixlib-7218f3a791cf1e0170a729026020804deb7500a6.tar.bz2 nixlib-7218f3a791cf1e0170a729026020804deb7500a6.tar.lz nixlib-7218f3a791cf1e0170a729026020804deb7500a6.tar.xz nixlib-7218f3a791cf1e0170a729026020804deb7500a6.tar.zst nixlib-7218f3a791cf1e0170a729026020804deb7500a6.zip | |
Merge pull request #79957 from mirrexagon/godot-3.2
godot: 3.1.2 -> 3.2
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/godot/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/godot/dont_clobber_environment.patch | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index e31d27f710bc..56b81f494e15 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "godot"; - version = "3.1.2"; + version = "3.2"; src = fetchFromGitHub { owner = "godotengine"; repo = "godot"; rev = "${version}-stable"; - sha256 = "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6"; + sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch index 96a8464b5668..3782aced1a4f 100644 --- a/pkgs/development/tools/godot/dont_clobber_environment.patch +++ b/pkgs/development/tools/godot/dont_clobber_environment.patch @@ -11,7 +11,6 @@ + if (k in os.environ): + env_base["ENV"][k] = os.environ[k] + - env_base.android_maven_repos = [] - env_base.android_flat_dirs = [] - env_base.android_dependencies = [] - + env_base.disabled_modules = [] + env_base.use_ptrcall = False + env_base.module_version_string = "" |