public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

godot: 3.2.1 -> 3.2.2

Browse Source
This commit is contained in:
tilpner
2020-07-07 22:17:58 +02:00
parent af0d1f955f
commit 20479cd349
3 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/godot/pkg_config_additions.patch
+17 -14
View File
@@ -1,22 +1,25 @@
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 5674e78350..7051d8e73c 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -175,6 +175,11 @@ def configure(env):
env.ParseConfig('pkg-config xrender --cflags --libs')
env.ParseConfig('pkg-config xi --cflags --libs')
@@ -201,6 +201,11 @@ 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')
+ 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")
+
if (env['touch']):
env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
@@ -264,7 +269,7 @@ def configure(env):
@@ -299,7 +304,7 @@ def configure(env):
print("Enabling ALSA")
env.Append(CPPFLAGS=["-DALSA_ENABLED", "-DALSAMIDI_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.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")
else:
print("ALSA libraries not found, disabling driver")