From 20479cd3492c98024e01cd029ab481fba5281dbc Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 7 Jul 2020 22:17:58 +0200
Subject: [PATCH] godot: 3.2.1 -> 3.2.2

---
 pkgs/development/tools/godot/default.nix      |  4 +--
 .../godot/dont_clobber_environment.patch      | 20 ++++++------
 .../tools/godot/pkg_config_additions.patch    | 31 ++++++++++---------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 832d30ee8e87..0d35ce253b1a 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -10,13 +10,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "godot";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = "${version}-stable";
-    sha256 = "1kndls0rklha7kz9l4i2ivjxab4jpk3b2j7dcgcg2qc3s81yd0r6";
+    sha256 = "1libz83mbyrkbbsmmi8z2rydv3ls0w9r4vb5v6diqqwn7ka8z804";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/godot/dont_clobber_environment.patch b/pkgs/development/tools/godot/dont_clobber_environment.patch
index 3782aced1a4f..b7c1d3d62335 100644
--- a/pkgs/development/tools/godot/dont_clobber_environment.patch
+++ b/pkgs/development/tools/godot/dont_clobber_environment.patch
@@ -1,16 +1,18 @@
-+++ build/SConstruct
-@@ -63,10 +63,10 @@ elif platform_arg == 'javascript':
-     custom_tools = ['cc', 'c++', 'ar', 'link', 'textfile', 'zip']
-
+diff --git a/SConstruct b/SConstruct
+index b3d033dc90..04b8dcc832 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -62,10 +62,9 @@ elif platform_arg == "javascript":
+     custom_tools = ["cc", "c++", "ar", "link", "textfile", "zip"]
+ 
  env_base = Environment(tools=custom_tools)
--if 'TERM' in os.environ:
--    env_base['ENV']['TERM'] = os.environ['TERM']
--env_base.AppendENVPath('PATH', os.getenv('PATH'))
--env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
+-if "TERM" in os.environ:
+-    env_base["ENV"]["TERM"] = os.environ["TERM"]
+-env_base.AppendENVPath("PATH", os.getenv("PATH"))
+-env_base.AppendENVPath("PKG_CONFIG_PATH", os.getenv("PKG_CONFIG_PATH"))
 +for k in ("TERM", "PATH", "PKG_CONFIG_PATH"):
 +    if (k in os.environ):
 +        env_base["ENV"][k] = os.environ[k]
-+
  env_base.disabled_modules = []
  env_base.use_ptrcall = False
  env_base.module_version_string = ""
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index 409baaa6f266..9e2e5c3536db 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/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")