From 95bc33c1ab1ff2dd324f0e3fe05e2c6ecea4ece9 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 24 Aug 2016 21:21:23 -0300
Subject: [PATCH 1/2] spring: 102.0 -> 103.0

---
 pkgs/games/spring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 3b7c307330d..42819f6992c 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -8,11 +8,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "102.0";
+  version = "103.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "0gjlpzwl3bdv1ickm8r3xlrbc6dm7m8i968hw3p0an49k6bqa77i";
+    sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l";
   };
 
   # The cmake included module correcly finds nix's glew, however

From 3b7304ebc3c9325b4c6ec1696885ad28e8c1d09d Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Wed, 24 Aug 2016 22:20:32 -0300
Subject: [PATCH 2/2] springLobby: 0.247 -> 0.255

---
 pkgs/games/spring/revert_58b423e.patch | 16 ++++++++++++++++
 pkgs/games/spring/springlobby.nix      |  6 ++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/games/spring/revert_58b423e.patch

diff --git a/pkgs/games/spring/revert_58b423e.patch b/pkgs/games/spring/revert_58b423e.patch
new file mode 100644
index 00000000000..79a42cefa5a
--- /dev/null
+++ b/pkgs/games/spring/revert_58b423e.patch
@@ -0,0 +1,16 @@
+--- a/src/utils/slpaths.cpp
++++ b/src/utils/slpaths.cpp
+@@ -165,13 +165,10 @@
+ 			usync_paths.push_back(bundle);
+ 		}
+ 		if (!SlPaths::IsPortableMode()) {
+-			/*
+-//FIXME: reenable when #707 is fixed / spring 102.0 is "established"
+ 			LSL::SpringBundle systembundle;
+ 			if (LSL::SpringBundle::LocateSystemInstalledSpring(systembundle)) {
+ 				usync_paths.push_back(systembundle);
+ 			}
+-*/
+ 
+ 			std::vector<std::string> paths;
+ 			PossibleEnginePaths(paths);
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 2cd9f24721f..62a5d81320f 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.247";
+  version = "0.255";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0sx14k4xsyjkmphhxfn9q341lv32c53g6wl1cbdx2sknzs3qasxs";
+    sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw";
   };
 
   buildInputs = [
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     substituteInPlace CMakeLists.txt --replace "boost_system-mt" "boost_system"
   '';
 
+  patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
+
   enableParallelBuilding = true;
 
   postInstall = ''