diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-03-27 21:34:06 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-03-27 21:34:06 +0100 |
| commit | 576e9289dd85a32187f92823a4c23979ad9d0709 (patch) | |
| tree | b9db30b6900dfd1caf1f0a5ed85826ed5e65e831 /pkgs/games | |
| parent | 151ac5ab9e4fd445b23fcfb6be7681129d544f23 (diff) | |
| parent | 9bde84a75d1ca5d60b1c21abab405206e0e5742c (diff) | |
| download | nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.gz nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.bz2 nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.lz nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.xz nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.tar.zst nixlib-576e9289dd85a32187f92823a4c23979ad9d0709.zip | |
Merge master into x-updates
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/spring/springlobby.nix | 11 | ||||
| -rw-r--r-- | pkgs/games/spring/unitsync_path_find.patch | 10 |
2 files changed, 5 insertions, 16 deletions
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 34760db7c68d..b5c8ef0154c2 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.186"; src = fetchurl { url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2"; - sha256 = "0v2pwrwiwiggyl95rcyfj3pdlwsss5vcmnyzd40r9swb9gyi55na"; + sha256 = "0pj7v85gl76hxvfhcypxsayk8lnnhgjn2irawgx49p80wsivl64k"; }; 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() ); |