From f933ccd309a58d2a8fdddea3d9233bc66abc9d35 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 2 Sep 2014 01:36:47 -0700 Subject: [PATCH 1/3] chocolateDoom and chocolateDoomMaster added chocolate doom is a port that aims to recreate the experience of Doom in the 1990s as accurately as possible --- pkgs/games/chocolate-doom/default.nix | 23 +++++++++++++++++++++++ pkgs/games/chocolate-doom/master.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 50 insertions(+) create mode 100644 pkgs/games/chocolate-doom/default.nix create mode 100644 pkgs/games/chocolate-doom/master.nix diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix new file mode 100644 index 000000000000..9cbc33dd9551 --- /dev/null +++ b/pkgs/games/chocolate-doom/default.nix @@ -0,0 +1,23 @@ +{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: + +stdenv.mkDerivation rec { + name = "chocolate-doom-2.0.0"; + src = fetchurl { + 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 ]; + 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 = "Chocolate Doom is 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 ]; + }; +} diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix new file mode 100644 index 000000000000..78db86ac059b --- /dev/null +++ b/pkgs/games/chocolate-doom/master.nix @@ -0,0 +1,24 @@ +{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: + +stdenv.mkDerivation rec { + name = "chocolate-doom-20140902"; + src = fetchgit { + url = git://github.com/fragglet/chocolate-doom.git; + rev = "204814c7bb16a8ad45435a15328072681978ea57"; + sha256 = "1xcdxpkgb9dk3zwqf4xcr3qn7dh5rx6hmniky67imbvi1h74p587"; + }; + buildInputs = [ autoconf 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 = "Chocolate Doom is 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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 901c80dc6590..b84e986b499f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -753,6 +753,9 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; + chocolateDoom = callPackage ../games/chocolate-doom { }; + chocolateDoomMaster = callPackage ../games/chocolate-doom/master.nix { }; + chrony = callPackage ../tools/networking/chrony { }; chunkfs = callPackage ../tools/filesystems/chunkfs { }; From b61d98728cb6564da06c0b72a8071a7da58bd32d Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 6 Sep 2014 16:15:37 -0700 Subject: [PATCH 2/3] Add notice for chocolateDoomMaster --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b84e986b499f..7b9e52ccc00b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -754,6 +754,7 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; 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 { }; From d2270f8d79e77beb4989b3bdf9429f465e14ad95 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 8 Sep 2014 22:11:14 -0700 Subject: [PATCH 3/3] Fix chocolateDoom and chocolateDoomMaster descriptions --- pkgs/games/chocolate-doom/default.nix | 2 +- pkgs/games/chocolate-doom/master.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 9cbc33dd9551..157d1b42af62 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://chocolate-doom.org/; - description = "Chocolate Doom is a Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s."; + 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 ]; }; diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix index 78db86ac059b..f0dc62aaaae7 100644 --- a/pkgs/games/chocolate-doom/master.nix +++ b/pkgs/games/chocolate-doom/master.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://chocolate-doom.org/; - description = "Chocolate Doom is a Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s."; + 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 ]; };