diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 93b69cee98e..b9f5f5d7e2a 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,19 +1,14 @@ -{ stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boostHeaders -, zip, zlib/*, lua5, tinyxml*/ }: - +{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}: stdenv.mkDerivation rec { - version = "1.0rc3"; - name = "blobby-volley-2-${version}"; + version = "2.0-RC1"; + name = "blobby-volley-${version}"; src = fetchurl { - url = "mirror://sourceforge/blobby/blobby2-linux-${version}.tar.gz"; - sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5"; + url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC1/blobby2-linux-1.0rc1.tar.gz"; + sha256 = "1cb56bd31vqkc12cmzp43q2aai99505isq2mii95jp0rzdqks4fy"; }; - buildInputs = [ - SDL SDL_image mesa cmake physfs boostHeaders - zip zlib # lua5 tinyxml # ToDo: use shared libs? - ]; + buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib]; preConfigure = '' sed -re '1i#include ' -i src/CrossCorrelation.h diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2759d0ab88..7cf1ecf198c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8169,7 +8169,9 @@ let blackshadeselite = callPackage ../games/blackshadeselite { }; - blobby = callPackage ../games/blobby { }; + blobby = callPackage ../games/blobby { + boost = boost149; + }; bsdgames = callPackage ../games/bsdgames { };