From 70a51b75e1aaadcf8ea21fe77c3f3b97f3b3673e Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 22 Mar 2014 12:49:20 +0200
Subject: [PATCH] springLobby: update from 0.180 to 0.182, get rid of patch,
 improve meta

---
 pkgs/games/spring/springlobby.nix          | 11 +++++------
 pkgs/games/spring/unitsync_path_find.patch | 10 ----------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/games/spring/unitsync_path_find.patch

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 34760db7c68d..9d7b281935b9 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "springlobby-${version}";
-  version = "0.180";
+  version = "0.182";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na";
+    sha256 = "121kvbbrcnp2yqzbnz3wai2m6mn7nrgqvb1d4ly0k98p3ar20m4v";
   };
 
   buildInputs = [
@@ -15,8 +15,6 @@ stdenv.mkDerivation rec {
     libnotify gtk doxygen makeWrapper
   ];
 
-  patches = [ ./unitsync_path_find.patch ];
-
   prePatch = ''
     substituteInPlace tools/regen_config_header.sh --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash"
     substituteInPlace tools/test-susynclib.awk --replace "#!/usr/bin/awk" "#!${gawk}/bin/awk"
@@ -31,14 +29,15 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/springlobby \
       --prefix PATH : "${spring}/bin" \
-      --set SPRING_LIB_DIRS "${spring}/lib"
+      --set SPRING_BUNDLE_DIR "${spring}/lib"
   '';
 
   meta = with stdenv.lib; {
     homepage = http://springlobby.info/;
+    repositories.git = git://github.com/springlobby/springlobby.git;
     description = "Cross-platform lobby client for the Spring RTS project";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom maintainers.qknight maintainers.iElectric ];
+    maintainers = with maintainers; [ phreedom qknight iElectric ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/spring/unitsync_path_find.patch b/pkgs/games/spring/unitsync_path_find.patch
deleted file mode 100644
index 66257a5f52fc..000000000000
--- a/pkgs/games/spring/unitsync_path_find.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/settings.cpp	2013-12-02 10:09:19.000000000 +0000
-+++ b/src/settings.cpp-new	2014-02-10 11:39:48.265628767 +0000
-@@ -498,6 +498,7 @@
- 
- wxString Settings::AutoFindUnitSync(wxPathList pl) const
- {
-+	pl.AddEnvList( _T( "SPRING_LIB_DIRS" ) );
- 	wxString retpath = pl.FindValidPath( _T( "unitsync" ) + GetLibExtension() );
- 	if ( retpath.IsEmpty() )
- 		retpath = pl.FindValidPath( _T( "libunitsync" ) + GetLibExtension() );