From cf8bb29287789bac582bffa3ddfda422eed2dac6 Mon Sep 17 00:00:00 2001 From: Andrew Abbott Date: Thu, 13 Feb 2020 10:27:23 +1100 Subject: [PATCH] godot: 3.1.2 -> 3.2 --- pkgs/development/tools/godot/default.nix | 4 ++-- .../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 = ""