diff options
Diffstat (limited to 'pkgs/games/chocolate-doom')
-rw-r--r-- | pkgs/games/chocolate-doom/default.nix | 6 | ||||
-rw-r--r-- | pkgs/games/chocolate-doom/master.nix | 24 |
2 files changed, 3 insertions, 27 deletions
diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index bd8d926769e61..ce38d06d65500 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,10 +1,10 @@ { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.0.0"; + name = "chocolate-doom-2.1.0"; src = fetchurl { - url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz; - sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; + url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; + sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1"; }; buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix deleted file mode 100644 index 3681a6781d871..0000000000000 --- a/pkgs/games/chocolate-doom/master.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: - -stdenv.mkDerivation rec { - name = "chocolate-doom-20141008"; - src = fetchgit { - url = git://github.com/fragglet/chocolate-doom.git; - rev = "63e1c884911f9e3382936f84a388e941b29343e6"; - sha256 = "1855a70widf1ni7lrfvp3hwxs1fhg1v5l738ckai88xpbak8i14m"; - }; - 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 - ''; - - enableParallelBuilding = true; - - meta = { - homepage = http://chocolate-doom.org/; - description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; - }; -} |