forked from mirrors/nixpkgs
springLobby: update from 0.180 to 0.182, get rid of patch, improve meta
This commit is contained in:
parent
306a760bdb
commit
70a51b75e1
|
@ -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;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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() );
|
Loading…
Reference in a new issue