diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-05 03:38:20 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-05 21:03:08 +0100 |
commit | 24100ec0c3474189291a8ea6c2226aeca2be811c (patch) | |
tree | 77e9a2b91688c09d7fca645925b583fe6f125090 /pkgs | |
parent | ad200bb5bccb6b607ceb4fc6e02ecba1d5b6021c (diff) |
soi: 0.1.1 -> 0.1.2
Now builds, but still mark as broken because it quickly segfaults at run time.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/soi/default.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 78e7dda459d65..2e8a085ef4741 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -1,31 +1,29 @@ -{ stdenv, fetchurl, mesa, SDL, cmake, eigen }: - -let - baseName = "soi"; - majorVersion = "0.1"; - minorVersion = "1"; - version = "${majorVersion}.${minorVersion}"; - name = "${baseName}-${version}"; -in +{ stdenv, fetchurl, cmake +, boost, eigen2, lua, luabind, mesa, SDL }: +let version = "0.1.2"; in stdenv.mkDerivation rec { - inherit name; + name = "soi-${version}"; + src = fetchurl { - url = "mirror://sourceforge/project/${baseName}/${baseName}-${majorVersion}/Spheres%20of%20Influence-${version}-Source.tar.gz"; - inherit name; - sha256 = "dfc59319d2962033709bb751c71728417888addc6c32cbec3da9679087732a81"; + url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2"; + name = "${name}.tar.bz2"; + sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd"; }; - buildInputs = [ mesa SDL cmake eigen ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ boost lua luabind mesa SDL ]; - preConfigure = ''export EIGENDIR=${eigen}/include/eigen2''; + cmakeFlags = [ + "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2" + ]; meta = with stdenv.lib; { description = "A physics-based puzzle game"; - maintainers = with maintainers; [ raskin ]; + maintainers = with maintainers; [ raskin nckx ]; platforms = platforms.linux; license = licenses.free; broken = true; - downloadPage = "http://sourceforge.net/projects/soi/files/"; + downloadPage = http://sourceforge.net/projects/soi/files/; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f4000320daf6..863798b21ac76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14313,7 +14313,9 @@ let snake4 = callPackage ../games/snake4 { }; - soi = callPackage ../games/soi {}; + soi = callPackage ../games/soi { + lua = lua5_1; + }; # You still can override by passing more arguments. spaceOrbit = callPackage ../games/orbit { }; |