b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

godot: 3.2.2 -> 3.3.2 (#123126)

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Robert Whitaker 2021-05-29 22:17:22 -04:00 committed by GitHub
parent 9640232d7c
commit 8a8500c2ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/tools/godot/default.nix
View file

@ -1,27 +1,30 @@
{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor { stdenv, lib, fetchFromGitHub, scons, pkg-config, udev, libX11
, libXinerama, libXrandr, libXrender, libpulseaudio ? null , libXcursor , libXinerama, libXrandr, libXrender, libpulseaudio
, libXi ? null, libXext, libXfixes, freetype, openssl , libXi, libXext, libXfixes, freetype, openssl
, alsaLib, libGLU, zlib, yasm ? null }: , alsaLib, libGLU, zlib, yasm
, withUdev ? true
}:
let let
options = { options = {
touch = libXi != null; touch = libXi != null;
pulseaudio = false; pulseaudio = false;
udev = withUdev;
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "godot"; pname = "godot";
version = "3.2.3"; version = "3.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "godotengine"; owner = "godotengine";
repo = "godot"; repo = "godot";
rev = "${version}-stable"; rev = "${version}-stable";
sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v"; sha256 = "0rfm6sbbwzvsn76a8aqagd7cqdzmk8qxphgl89k7y982l9a5sz50";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
scons libX11 libXcursor libXinerama libXrandr libXrender scons udev libX11 libXcursor libXinerama libXrandr libXrender
libXi libXext libXfixes freetype openssl alsaLib libpulseaudio libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
libGLU zlib yasm libGLU zlib yasm
]; ];

17
pkgs/development/tools/godot/dont_clobber_environment.patch
View file

@ -1,18 +1,19 @@
diff --git a/SConstruct b/SConstruct diff --git a/SConstruct b/SConstruct
index b3d033dc90..04b8dcc832 100644 index d138c7b250..c925bf908e 100644
--- a/SConstruct --- a/SConstruct
+++ b/SConstruct +++ b/SConstruct
@@ -62,10 +62,9 @@ elif platform_arg == "javascript": @@ -65,10 +65,10 @@ elif platform_arg == "javascript":
custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"] # want to have to pull in manually.
# Then we prepend PATH to make it take precedence, while preserving SCons' own entries.
env_base = Environment(tools=custom_tools) env_base = Environment(tools=custom_tools)
-if "TERM" in os.environ: -env_base.PrependENVPath("PATH", os.getenv("PATH"))
-env_base.PrependENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
-if "TERM" in os.environ: # Used for colored output.
- env_base["ENV"]["TERM"] = os.environ["TERM"] - 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"): +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
+ 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.disabled_modules = [] env_base.disabled_modules = []
env_base.use_ptrcall = False env_base.use_ptrcall = False
env_base.module_version_string = ""

23
pkgs/development/tools/godot/pkg_config_additions.patch
View file

@ -1,11 +1,11 @@
diff --git a/platform/x11/detect.py b/platform/x11/detect.py diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 5674e78350..7051d8e73c 100644 index 91652aad55..d12389f9f2 100644
--- a/platform/x11/detect.py --- a/platform/x11/detect.py
+++ b/platform/x11/detect.py +++ b/platform/x11/detect.py
@@ -201,6 +201,11 @@ def configure(env): @@ -218,6 +218,11 @@ def configure(env):
env.ParseConfig("pkg-config xrender --cflags --libs") env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs") env.ParseConfig("pkg-config xi --cflags --libs")
+ env.ParseConfig("pkg-config xext --cflags --libs") + env.ParseConfig("pkg-config xext --cflags --libs")
+ env.ParseConfig("pkg-config xfixes --cflags --libs") + env.ParseConfig("pkg-config xfixes --cflags --libs")
+ env.ParseConfig("pkg-config glu --cflags --libs") + env.ParseConfig("pkg-config glu --cflags --libs")
@ -13,13 +13,20 @@ index 5674e78350..7051d8e73c 100644
+ +
if env["touch"]: if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"]) env.Append(CPPDEFINES=["TOUCH_ENABLED"])
@@ -299,7 +304,7 @@ def configure(env): @@ -323,6 +328,7 @@ def configure(env):
print("Enabling ALSA") print("Enabling ALSA")
env["alsa"] = True
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"]) env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
# Don't parse --cflags, we don't need to add /usr/include/alsa to include path
- env.ParseConfig("pkg-config alsa --libs")
+ env.ParseConfig("pkg-config alsa --cflags --libs") + env.ParseConfig("pkg-config alsa --cflags --libs")
else: else:
print("ALSA libraries not found, disabling driver") print("ALSA libraries not found, disabling driver")
@@ -340,6 +346,7 @@ def configure(env):
if os.system("pkg-config --exists libudev") == 0: # 0 means found
print("Enabling udev support")
env.Append(CPPDEFINES=["UDEV_ENABLED"])
+ env.ParseConfig("pkg-config libudev --cflags --libs")
else:
print("libudev development libraries not found, disabling udev support")
else: