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

godot: 3.0.6 -> 3.1

Browse Source
This commit is contained in:
tilpner
2019-03-21 19:23:04 +01:00
parent 0cbe2fa18c
commit 94717b7ee1
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/godot/pkg_config_additions.patch
+16 -7
View File
@@ -1,13 +1,22 @@
+++ b/platform/x11/detect.py
@@ -142,6 +142,11 @@
env.ParseConfig('pkg-config xcursor --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xrandr --cflags --libs')
+ env.ParseConfig('pkg-config xrender --cflags --libs')
@@ -175,6 +175,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')
+
if (env['touch']):
x11_error = os.system("pkg-config xi --modversion > /dev/null ")
env.Append(CPPFLAGS=['-DTOUCH_ENABLED'])
@@ -264,7 +269,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')
else:
print("ALSA libraries not found, disabling driver")