diff options
| author | James Kay <james@hadean.com> | 2018-03-19 11:59:55 +0000 |
|---|---|---|
| committer | James Kay <james@hadean.com> | 2018-03-19 11:59:55 +0000 |
| commit | 2220b5fe99acf5f31f825ee659f23c9b729c228f (patch) | |
| tree | 4976f8a05eae1c744808d4fed40a7326bfedb45d /pkgs/development/tools/godot | |
| parent | d1d320f4935408b4535e8d4feaffc69cec2038a8 (diff) | |
| download | nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.tar nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.tar.gz nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.tar.bz2 nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.tar.lz nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.tar.xz nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.tar.zst nixlib-2220b5fe99acf5f31f825ee659f23c9b729c228f.zip | |
godot: update patches for 3.0.2
Diffstat (limited to 'pkgs/development/tools/godot')
| -rw-r--r-- | pkgs/development/tools/godot/pkg_config_additions.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index 4870ec3cd70b..f20226c58190 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -1,15 +1,17 @@ +++ build/platform/x11/detect.py -@@ -142,3 +142,10 @@ +@@ -142,8 +142,13 @@ env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config xinerama --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') +- +- if (env['touch']): + 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 oslibGLU_combined --cflags') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') - - if (env['builtin_openssl'] == 'no'): - # Currently not compatible with OpenSSL 1.1.0+ ++ ++ if (env['touch']): + x11_error = os.system("pkg-config xi --modversion > /dev/null ") + if (x11_error): + print("xi not found.. cannot build with touch. Aborting.") |