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

godot: simplify pkg_config_additions.patch

Browse Source
This commit is contained in:
James Kay
2018-03-19 14:51:18 +00:00
parent 2220b5fe99
commit 368ed89aa0
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/godot/pkg_config_additions.patch
+4 -8
View File
@@ -1,17 +1,13 @@
+++ build/platform/x11/detect.py +++ b/platform/x11/detect.py
@@ -142,8 +142,13 @@ @@ -142,6 +142,11 @@
env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xrandr --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs')
-
- if (env['touch']):
+ env.ParseConfig('pkg-config xrender --cflags --libs') + env.ParseConfig('pkg-config xrender --cflags --libs')
+ env.ParseConfig('pkg-config xext --cflags --libs') + env.ParseConfig('pkg-config xext --cflags --libs')
+ env.ParseConfig('pkg-config xfixes --cflags --libs') + env.ParseConfig('pkg-config xfixes --cflags --libs')
+ env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config glu --cflags --libs')
+ env.ParseConfig('pkg-config zlib --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs')
+
+ if (env['touch']): if (env['touch']):
x11_error = os.system("pkg-config xi --modversion > /dev/null ") x11_error = os.system("pkg-config xi --modversion > /dev/null ")
if (x11_error):
print("xi not found.. cannot build with touch. Aborting.")