nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch

26 lines
1.0 KiB
Diff
Raw Normal View History

2020-07-07 21:17:58 +01:00
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
2020-07-07 21:17:58 +01:00
@@ -201,6 +201,11 @@ def configure(env):
env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs")
2019-03-21 10:08:54 +00:00
2020-07-07 21:17:58 +01:00
+ 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")
2019-03-21 10:08:54 +00:00
+
2020-07-07 21:17:58 +01:00
if env["touch"]:
env.Append(CPPDEFINES=["TOUCH_ENABLED"])
2019-03-21 10:08:54 +00:00
2020-07-07 21:17:58 +01:00
@@ -299,7 +304,7 @@ def configure(env):
2019-03-21 10:08:54 +00:00
print("Enabling ALSA")
2020-07-07 21:17:58 +01:00
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")
2019-03-21 10:08:54 +00:00
else:
print("ALSA libraries not found, disabling driver")