From 6c21cde68df8495fce97c5250f408bf303120854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 17 Mar 2013 20:36:47 +0100 Subject: [PATCH] blobby: minor update, making it build --- pkgs/games/blobby/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index b9f5f5d7e2a..93b69cee98e 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,14 +1,19 @@ -{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}: +{ stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boostHeaders +, zip, zlib/*, lua5, tinyxml*/ }: + stdenv.mkDerivation rec { - version = "2.0-RC1"; - name = "blobby-volley-${version}"; + version = "1.0rc3"; + name = "blobby-volley-2-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC1/blobby2-linux-1.0rc1.tar.gz"; - sha256 = "1cb56bd31vqkc12cmzp43q2aai99505isq2mii95jp0rzdqks4fy"; + url = "mirror://sourceforge/blobby/blobby2-linux-${version}.tar.gz"; + sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5"; }; - buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib]; + buildInputs = [ + SDL SDL_image mesa cmake physfs boostHeaders + zip zlib # lua5 tinyxml # ToDo: use shared libs? + ]; 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 b679c6c4d52..61142934345 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8153,9 +8153,7 @@ let blackshadeselite = callPackage ../games/blackshadeselite { }; - blobby = callPackage ../games/blobby { - boost = boost149; - }; + blobby = callPackage ../games/blobby { }; bsdgames = callPackage ../games/bsdgames { };