Merge pull request #79957 from mirrexagon/godot-3.2

godot: 3.1.2 -> 3.2
This commit is contained in:
Aaron Andersen 2020-03-06 06:21:48 -05:00 committed by GitHub
commit 7218f3a791
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View file

@ -10,13 +10,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "godot"; pname = "godot";
version = "3.1.2"; version = "3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "godotengine"; owner = "godotengine";
repo = "godot"; repo = "godot";
rev = "${version}-stable"; rev = "${version}-stable";
sha256 = "12305wj2i4067jc50l8r0wmb7zjcna24fli8vb8kiaild0jrlip6"; sha256 = "0f15izjl4i2xlz1xj5pcslzl9gm3rmr3c21gh256ynpi2zhhkcdd";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

View file

@ -11,7 +11,6 @@
+ if (k in os.environ): + if (k in os.environ):
+ env_base["ENV"][k] = os.environ[k] + env_base["ENV"][k] = os.environ[k]
+ +
env_base.android_maven_repos = [] env_base.disabled_modules = []
env_base.android_flat_dirs = [] env_base.use_ptrcall = False
env_base.android_dependencies = [] env_base.module_version_string = ""