diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2011-04-13 05:47:51 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2011-04-13 05:47:51 +0000 |
| commit | 8a00dfcc189198b7e2f64725e74b77c117a04d16 (patch) | |
| tree | 9ad271bc6834dfd721a2e06b12ac8fd7113aa087 /pkgs/games/teeworlds | |
| parent | 13a1c3a69b0d2d312a2d2ff7295a25cf5197a389 (diff) | |
| download | nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.tar nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.tar.gz nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.tar.bz2 nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.tar.lz nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.tar.xz nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.tar.zst nixpkgs-8a00dfcc189198b7e2f64725e74b77c117a04d16.zip | |
Update teeworlds
svn path=/nixpkgs/trunk/; revision=26814
Diffstat (limited to 'pkgs/games/teeworlds')
| -rw-r--r-- | pkgs/games/teeworlds/default.nix | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 1185b663a02..35b20fff98d 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,34 +1,19 @@ -{ fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL }: +{ fetchurl, stdenv, python, alsaLib, libX11, mesa, SDL, lua5, zlib, bam }: stdenv.mkDerivation rec { - name = "teeworlds-0.5.2"; + name = "teeworlds-0.6.0"; src = fetchurl { url = "http://www.teeworlds.com/files/${name}-src.tar.gz"; - sha256 = "1h7likcqbyr3q8djzlgxmr8fiwwj8is3b01hd5x0qix1z4dsf48q"; + sha256 = "7540ecf10624b7e4e530c44402dc2d162ff40a3fe10bf30e0bb542d3d0a6a721"; }; # Note: Teeworlds requires Python 2.x to compile. Python 3.0 will # not work. - buildInputs = [ python alsaLib libX11 mesa SDL ]; + buildInputs = [ python alsaLib libX11 mesa SDL lua5 zlib bam ]; - patchPhase = '' - substituteInPlace "default.bam" \ - --replace 'settings.linker.flags = ""' \ - 'settings.linker.flags = "-fstack-protector-all"' - ''; configurePhase = '' - # Fetch and build BAM, the home-made build system. - # FIXME: Move BAM outside of here. See http://www.teeworlds.com/trac/bam . - tar xzvf ${fetchurl { - url = "http://teeworlds.com/trac/bam/browser/releases/bam-0.2.0.tar.gz?format=raw"; - sha256 = "0n077iiidw7xsyna4y92pz5dwqaywps3w0v5c88dic27vz0xsv7g"; - } - } - ( cd bam-* && ./make_unix.sh ) - - # Build Teeworlds. - ./bam-*/src/bam release + bam release ''; installPhase = '' |