From 40cd4a8a9d671b3286facdffad4ba483cd8ab518 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 2 May 2013 13:13:11 +0200 Subject: [PATCH] xonotic: Remove from the channel It's 878 MiB compressed. --- pkgs/games/xonotic/default.nix | 16 +++++++++++++--- pkgs/top-level/release-python.nix | 1 - 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 3553649dccb8..957d7b2c7f45 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,29 +1,37 @@ { stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: + stdenv.mkDerivation rec { name = "xonotic-0.5.0"; + src = fetchurl { url = "http://dl.xonotic.org/${name}.zip"; sha256 = "03vkbddffnz6ws3gkwc3qvi6icfsyiqq0dqw2vw5hj2kidm25rsq"; }; + # Commented out things needed to build cl-release because of errors. #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ]; buildInputs = [ unzip SDL libjpeg ]; + sourceRoot = "Xonotic/source/darkplaces"; + #patchPhase = '' # substituteInPlace glquake.h \ # --replace 'typedef char GLchar;' '/*typedef char GLchar;*/' #''; - NIX_LDFLAGS=" + + NIX_LDFLAGS = '' -rpath ${zlib}/lib -rpath ${libvorbis}/lib -rpath ${curl}/lib - "; + ''; + buildPhase = '' DP_FS_BASEDIR="$out/share/xonotic" #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-release make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release ''; + installPhase = '' mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" @@ -32,7 +40,9 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" ''; + dontPatchELF = true; + meta = { description = "A free fast-paced first-person shooter"; longDescription = '' @@ -46,6 +56,6 @@ stdenv.mkDerivation rec { homepage = http://www.xonotic.org; license = with stdenv.lib.licenses; gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = with stdenv.lib.platforms; linux; + #platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index b418a332f8bf..d76eeec93dd4 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -1960,7 +1960,6 @@ in xnee = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xneur = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xneur_0_8 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; - xonotic = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorg_sys_opengl = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xorgVideoUnichrome = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; xoscope = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };