about summary refs log tree commit diff
path: root/pkgs/development/tools/godot
diff options
context:
space:
mode:
authorRobin Raymond <robin@robinraymond.de>2017-06-30 16:52:59 +0200
committervbgl <vbgl@users.noreply.github.com>2017-07-08 14:48:35 +0200
commit4a3e1d83a15375056562ce4cf4599913d79479fc (patch)
tree58c04fa8bbdd296bf7955e38bd51463c7d1f6838 /pkgs/development/tools/godot
parent645f11b13da59e6f7082572ad272db1d425b0cc6 (diff)
downloadnixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.tar
nixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.tar.gz
nixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.tar.bz2
nixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.tar.lz
nixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.tar.xz
nixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.tar.zst
nixlib-4a3e1d83a15375056562ce4cf4599913d79479fc.zip
godot 2.1.1-stable -> 2.1.3-stable
Diffstat (limited to 'pkgs/development/tools/godot')
-rw-r--r--pkgs/development/tools/godot/default.nix4
-rw-r--r--pkgs/development/tools/godot/pkg_config_additions.patch4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index a2ff84108899..62bf6557f68c 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name    = "godot-${version}";
-  version = "2.1.1-stable";
+  version = "2.1.3-stable";
 
   src = fetchFromGitHub {
     owner  = "godotengine";
     repo   = "godot";
     rev    = version;
-    sha256 = "071qkm1l6yn2s9ha67y15w2phvy5m5wl3wqvrslhfmnsir3q3k01";
+    sha256 = "04qbab0icpv3ascr4dqgj18sqvw04a1jypcngb0ji8npa8q9wxb2";
   };
 
   buildInputs = [
diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch
index f5e835a73749..c4675322e2b3 100644
--- a/pkgs/development/tools/godot/pkg_config_additions.patch
+++ b/pkgs/development/tools/godot/pkg_config_additions.patch
@@ -1,5 +1,5 @@
 +++ build/platform/x11/detect.py
-@@ -132,6 +132,10 @@
+@@ -139,6 +139,10 @@
      env.ParseConfig('pkg-config xinerama --cflags --libs')
      env.ParseConfig('pkg-config xcursor --cflags --libs')
      env.ParseConfig('pkg-config xrandr --cflags --libs')
@@ -9,4 +9,4 @@
 +    env.ParseConfig('pkg-config zlib --cflags --libs')
 
      if (env['builtin_openssl'] == 'no'):
-         env.ParseConfig('pkg-config openssl --cflags --libs')
+         # Currently not compatible with OpenSSL 1.1.0+