diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2014-10-08 06:31:42 -0700 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-10-08 21:43:26 +0100 |
| commit | c067b37cf7051358a4f2d7d5254de20e097629b8 (patch) | |
| tree | fdbd9cffb22d4d626492ccd956a5a7d2516f2e02 /pkgs/games | |
| parent | 31ea2fc8d5e25035c6e8db3a895f84c067670f26 (diff) | |
| download | nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.tar nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.tar.gz nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.tar.bz2 nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.tar.lz nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.tar.xz nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.tar.zst nixlib-c067b37cf7051358a4f2d7d5254de20e097629b8.zip | |
Fix a silly mistake in the chocolateDoom packages, and bump master
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
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/chocolate-doom/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/games/chocolate-doom/master.nix | 8 |
2 files changed, 5 insertions, 5 deletions
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 |