diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-06 19:25:45 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-06 19:25:45 +0000 |
| commit | 005bf71e51dc5bdd1dd6a0188cebfa47c74c3515 (patch) | |
| tree | 1208199ce9b4763d50c911c2dcc4c4be9ff295c1 /pkgs | |
| parent | 1dce71822eda6f6fc70de67f2193d99d6d5702ac (diff) | |
Updating neverball. That required adding physfs.
svn path=/nixpkgs/trunk/; revision=18220
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/physfs/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/games/neverball/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 30 insertions, 7 deletions
diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix new file mode 100644 index 0000000000000..3eb9a980c8190 --- /dev/null +++ b/pkgs/development/libraries/physfs/default.nix @@ -0,0 +1,18 @@ +{stdenv, fetchurl, cmake}: + +stdenv.mkDerivation rec { + name = "physfs-2.0.0"; + + src = fetchurl { + url = "${meta.homepage}/downloads/${name}.tar.gz"; + sha256 = "072hqprni4vf4ax6b659s2xxrbz0y6iziarsczawbhi69m4azpyb"; + }; + + buildInputs = [ cmake ]; + + meta = { + homepage = http://icculus.org/physfs/; + description = "Library to provide abstract access to various archives"; + license = "free"; + }; +} diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 1e31ad303870e..987870193019a 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchurl, SDL, mesa, libpng, libjpeg, SDL_ttf, libvorbis, gettext} : +{stdenv, fetchurl, SDL, mesa, libpng, libjpeg, SDL_ttf, libvorbis, gettext, +physfs} : -stdenv.mkDerivation { - name = "neverball-1.5.1"; +stdenv.mkDerivation rec { + name = "neverball-1.5.4"; src = fetchurl { - url = http://neverball.org/neverball-1.5.1.tar.gz; - sha256 = "0cqi6q829p1wx4471ab74xd7hmcvjg4fvj40rdc3342rvfqpijv5"; + url = "http://neverball.org/${name}.tar.gz"; + sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga"; }; - buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext ]; + buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs]; dontPatchElf = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51be93cd437ed..753bba34db7c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4327,6 +4327,10 @@ let cplusplusSupport = !stdenv ? isDietLibC; }; + physfs = import ../development/libraries/physfs { + inherit fetchurl stdenv cmake; + }; + plib = import ../development/libraries/plib { inherit fetchurl stdenv mesa freeglut SDL; inherit (xlibs) libXi libSM libXmu libXext libX11; @@ -5816,7 +5820,7 @@ let neverball = import ../games/neverball { inherit stdenv fetchurl SDL mesa libpng libjpeg SDL_ttf libvorbis - gettext; + gettext physfs; }; numactl = import ../os-specific/linux/numactl { |