summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorCray Elliott <MP2E@archlinux.us>2014-09-06 16:18:23 -0700
committerCray Elliott <MP2E@archlinux.us>2014-09-06 16:18:35 -0700
commiteb7dbf90677983f7febf251c3f286a0dc7966507 (patch)
tree13ad4bd40543934a99cec7c4b85ab6be91587356 /pkgs
parentdb64ebe167c653ef2b45bc253b6367b4e70666aa (diff)
downloadnixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.tar
nixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.tar.gz
nixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.tar.bz2
nixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.tar.lz
nixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.tar.xz
nixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.tar.zst
nixlib-eb7dbf90677983f7febf251c3f286a0dc7966507.zip
Remove eternityMaster
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/games/eternity-engine/master.nix30
-rw-r--r--pkgs/top-level/all-packages.nix1
2 files changed, 0 insertions, 31 deletions
diff --git a/pkgs/games/eternity-engine/master.nix b/pkgs/games/eternity-engine/master.nix
deleted file mode 100644
index 0d0f8e26b440..000000000000
--- a/pkgs/games/eternity-engine/master.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, cmake, mesa, SDL, SDL_mixer, SDL_net, fetchgit }:
-
-stdenv.mkDerivation rec {
-  name = "eternity-engine-20140902";
-  src = fetchgit {
-    url = git://github.com/team-eternity/eternity.git;
-    rev = "db21379abb33f6d92dc0e1665e527e4d49acc722";
-    sha256 = "0k54yvxqxnd60az21b734ka3myxkqb7pjmdp3klrkfwp1kl02ysc";
-  };
-
-  cmakeFlags = ''
-    -DCMAKE_BUILD_TYPE=Release
-  '';
-
-  buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-  mkdir -p $out/bin
-  cp source/eternity $out/bin
-  '';
-
-  meta = {
-    homepage = http://doomworld.com/eternity;
-    description = "New school Doom port by James Haley";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ MP2E ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30f43d300599..2bf19ae4bab5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -994,7 +994,6 @@ let
   ethtool = callPackage ../tools/misc/ethtool { };
 
   eternity = callPackage ../games/eternity-engine { };
-  eternityMaster = callPackage ../games/eternity-engine/master.nix { };
 
   ettercap = callPackage ../applications/networking/sniffers/ettercap { };