diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 157d1b42af62..bd8d926769e6 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz; sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; }; - buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; + buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ./autogen.sh --prefix=$out diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix index f0dc62aaaae7..3681a6781d87 100644 --- a/pkgs/games/chocolate-doom/master.nix +++ b/pkgs/games/chocolate-doom/master.nix @@ -1,13 +1,13 @@ { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: stdenv.mkDerivation rec { - name = "chocolate-doom-20140902"; + name = "chocolate-doom-20141008"; src = fetchgit { url = git://github.com/fragglet/chocolate-doom.git; - rev = "204814c7bb16a8ad45435a15328072681978ea57"; - sha256 = "1xcdxpkgb9dk3zwqf4xcr3qn7dh5rx6hmniky67imbvi1h74p587"; + rev = "63e1c884911f9e3382936f84a388e941b29343e6"; + sha256 = "1855a70widf1ni7lrfvp3hwxs1fhg1v5l738ckai88xpbak8i14m"; }; - buildInputs = [ autoconf autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; + buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ./autogen.sh --prefix=$out