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

update chocolateDoom to v2.1.0, chocolateDoomMaster removed

Browse source
This commit is contained in:
Cray Elliott 2014-10-21 23:47:51 -07:00
parent 57aaf3d36e
commit 48e0a0a3c8
3 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "chocolate-doom-2.0.0"; name = "chocolate-doom-2.1.0";
src = fetchurl { src = fetchurl {
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/${name}.tar.gz";
sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1";
}; };
buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ];
patchPhase = '' patchPhase = ''

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

@ -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 ];
};
}

2
pkgs/top-level/all-packages.nix
View file

@ -811,8 +811,6 @@ let
chkrootkit = callPackage ../tools/security/chkrootkit { }; chkrootkit = callPackage ../tools/security/chkrootkit { };
chocolateDoom = callPackage ../games/chocolate-doom { }; chocolateDoom = callPackage ../games/chocolate-doom { };
# master is here because chocolateDoom v2.0 has broken netplay
chocolateDoomMaster = callPackage ../games/chocolate-doom/master.nix { };
chrony = callPackage ../tools/networking/chrony { }; chrony = callPackage ../tools/networking/chrony { };