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

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

34 lines
1.5 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 98c9ddb..0cc2bff 100644
2020-07-07 21:17:58 +01:00
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -255,6 +255,10 @@ def configure(env):
2020-07-07 21:17:58 +01:00
env.ParseConfig("pkg-config xrender --cflags --libs")
env.ParseConfig("pkg-config xi --cflags --libs")
2020-07-07 21:17:58 +01:00
+ 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"])
@@ -359,7 +363,7 @@ def configure(env):
if os.system("pkg-config --exists alsa") == 0: # 0 means found
env["alsa"] = True
2020-07-07 21:17:58 +01:00
env.Append(CPPDEFINES=["ALSA_ENABLED", "ALSAMIDI_ENABLED"])
- env.ParseConfig("pkg-config alsa --cflags") # Only cflags, we dlopen the library.
2020-07-07 21:17:58 +01:00
+ env.ParseConfig("pkg-config alsa --cflags --libs")
2019-03-21 10:08:54 +00:00
else:
print("Warning: ALSA libraries not found. Disabling the ALSA audio driver.")
@@ -375,7 +379,7 @@ def configure(env):
if env["udev"]:
if os.system("pkg-config --exists libudev") == 0: # 0 means found
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("Warning: libudev development libraries not found. Disabling controller hotplugging support.")
else: