alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Fix a silly mistake in the chocolateDoom packages, and bump master

Browse source 
master was bumped because a few critical bugs were found in the chocolate-strife netcode (and were subsequently fixed). Still pestering upstream for a new release :P

Closes #4422
This commit is contained in:
Cray Elliott 2014-10-08 06:31:42 -07:00 committed by Mateusz Kowalczyk
parent 31ea2fc8d5
commit c067b37cf7
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/games/chocolate-doom/default.nix
View file

@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz; url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz;
sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1";
}; };
buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ];
patchPhase = '' patchPhase = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
./autogen.sh --prefix=$out ./autogen.sh --prefix=$out

8
pkgs/games/chocolate-doom/master.nix
View file

@ -1,13 +1,13 @@
{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chocolate-doom-20140902"; name = "chocolate-doom-20141008";
src = fetchgit { src = fetchgit {
url = git://github.com/fragglet/chocolate-doom.git; url = git://github.com/fragglet/chocolate-doom.git;
rev = "204814c7bb16a8ad45435a15328072681978ea57"; rev = "63e1c884911f9e3382936f84a388e941b29343e6";
sha256 = "1xcdxpkgb9dk3zwqf4xcr3qn7dh5rx6hmniky67imbvi1h74p587"; sha256 = "1855a70widf1ni7lrfvp3hwxs1fhg1v5l738ckai88xpbak8i14m";
}; };
buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net git ];
patchPhase = '' patchPhase = ''
sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am
./autogen.sh --prefix=$out ./autogen.sh --prefix=$out