diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-07-01 11:04:36 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-07-01 11:54:09 +0400 |
| commit | 5ed1adbbd4bcf1e3372d42fd73b0bfddbe4b84a8 (patch) | |
| tree | 810d1cfeee1fed185b8ead27246b873e8712e3be /pkgs/games/blobby | |
| parent | 60ccbebc4e46354ce5c2b0ec2bdbe5a01f30bdd3 (diff) | |
Update Blobby Volley
Diffstat (limited to 'pkgs/games/blobby')
| -rw-r--r-- | pkgs/games/blobby/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/games/blobby/default.upstream | 8 |
2 files changed, 19 insertions, 7 deletions
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index faf7366f2494..801b7ea72770 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}: +{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib +, pkgconfig}: stdenv.mkDerivation rec { - version = "1.0-rc3"; + version = "1.0"; name = "blobby-volley-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC3/blobby2-linux-1.0rc3.tar.gz"; - sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5"; + url = "http://softlayer-ams.dl.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz"; + sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms"; }; - buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib]; + buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig]; - preConfigure = '' - sed -re '1i#include <cassert>' -i src/CrossCorrelation.h + preConfigure='' + sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp ''; meta = { @@ -19,5 +20,8 @@ stdenv.mkDerivation rec { license = with stdenv.lib.licenses; bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; + homepage = "http://blobby.sourceforge.net/"; + downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; + inherit version; }; } diff --git a/pkgs/games/blobby/default.upstream b/pkgs/games/blobby/default.upstream new file mode 100644 index 000000000000..e9ab417f5d20 --- /dev/null +++ b/pkgs/games/blobby/default.upstream @@ -0,0 +1,8 @@ +url http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/ +SF_version_dir +version_link '[.]tar[.][^.]+/download$' +SF_redirect +do_overwrite(){ + do_overwrite_just_version + set_var_value url $CURRENT_URL +} |