cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

godot: 3.4.4 -> 3.5 (#186692)

Browse source 
Co-authored-by: matthewcroughan <matt@croughan.sh>
This commit is contained in:
Leiser Fernández Gallo 2022-08-19 22:06:25 +02:00 committed by GitHub
parent cfe12e8c8a
commit ae978f07c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,8 @@
, freetype
, openssl
, alsa-lib
, alsa-plugins
, makeWrapper
, libGLU
, zlib
, yasm
@ -31,16 +33,16 @@ let
in
stdenv.mkDerivation rec {
pname = "godot";
version = "3.4.4";
version = "3.5";
src = fetchFromGitHub {
owner = "godotengine";
repo = "godot";
rev = "${version}-stable";
sha256 = "sha256-3AESLzqozi7Fc80u8Ml3ergZMkIhHy4tNlRe/3FsE6k=";
sha256 = "sha256-aU5cTiz7OaM0fsv0EzJDUA1Es+Ei63CKLE6GVspJexc=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [
scons
udev
@ -91,6 +93,9 @@ stdenv.mkDerivation rec {
cp icon.png "$out/share/icons/godot.png"
substituteInPlace "$out/share/applications/org.godotengine.Godot.desktop" \
--replace "Exec=godot" "Exec=$out/bin/godot"
makeWrapper $out/bin/godot $out/bin/godot \
--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
'';
meta = with lib; {

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

@ -1,12 +1,11 @@
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 91652aad55..d12389f9f2 100644
index 98c9ddb..0cc2bff 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -218,6 +218,11 @@ def configure(env):
@@ -255,6 +255,10 @@ def configure(env):
env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs")
+ env.ParseConfig("pkg-config xext --cflags --libs")
+ env.ParseConfig("pkg-config xfixes --cflags --libs")
+ env.ParseConfig("pkg-config glu --cflags --libs")
+ env.ParseConfig("pkg-config zlib --cflags --libs")
@ -14,19 +13,21 @@ index 91652aad55..d12389f9f2 100644
if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
@@ -323,6 +328,7 @@ def configure(env):
print("Enabling ALSA")
@@ -359,7 +363,7 @@ def configure(env):
if os.system("pkg-config --exists alsa") == 0: # 0 means found
env["alsa"] = True
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
- env.ParseConfig("pkg-config alsa --cflags") # Only cflags, we dlopen the library.
+ env.ParseConfig("pkg-config alsa --cflags --libs")
else:
print("ALSA libraries not found, disabling driver")
print("Warning: ALSA libraries not found. Disabling the ALSA audio driver.")
@@ -340,6 +346,7 @@ def configure(env):
@@ -375,7 +379,7 @@ def configure(env):
if env["udev"]:
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") # Only cflags, we dlopen the library.
+ env.ParseConfig("pkg-config libudev --cflags --libs")
else:
print("libudev development libraries not found, disabling udev support")
print("Warning: libudev development libraries not found. Disabling controller hotplugging support.")
else: