diff options
Diffstat (limited to 'nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch')
-rw-r--r-- | nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch index 409baaa6f26..9e2e5c3536d 100644 --- a/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/nixpkgs/pkgs/development/tools/godot/pkg_config_additions.patch @@ -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") |