diff options
author | rszibele <rszibele@server.fake> | 2014-01-01 17:47:32 +0100 |
---|---|---|
committer | rszibele <rszibele@server.fake> | 2014-01-01 17:47:32 +0100 |
commit | 5cc98b77cd7ef5dd655f68a85600bd12a624a0e1 (patch) | |
tree | 9e2df15e053685c21f187f80af44eeb4e7f4baa3 /pkgs/games/xonotic/default.nix | |
parent | 506a30418125d69b22a7e52c1d9dbe5f3bb7450c (diff) |
xonotic: compile the glx version and add a symlink to default to the sdl
version.
Diffstat (limited to 'pkgs/games/xonotic/default.nix')
-rw-r--r-- | pkgs/games/xonotic/default.nix | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 137429cdc8382..9db82d722d276 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchurl, unzip, SDL, libjpeg, zlib, libvorbis, curl }: +{ stdenv, fetchurl +, # required for both + unzip, libjpeg, zlib, libvorbis, curl +, # glx + libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib +, # sdl + SDL +}: stdenv.mkDerivation rec { name = "xonotic-0.7.0"; @@ -8,9 +15,14 @@ stdenv.mkDerivation rec { sha256 = "21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6"; }; - # Commented out things needed to build cl-release because of errors. - #buildInputs = [ libX11 libXpm libXext xf86dgaproto libXxf86dga libXxf86vm mesa ]; - buildInputs = [ unzip SDL libjpeg ]; + buildInputs = [ + # required for both + unzip libjpeg + # glx + libX11 mesa libXpm libXext libXxf86vm alsaLib + # sdl + SDL + ]; sourceRoot = "Xonotic/source/darkplaces"; @@ -27,7 +39,7 @@ stdenv.mkDerivation rec { buildPhase = '' DP_FS_BASEDIR="$out/share/xonotic" - #make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-release + 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 ''; @@ -36,9 +48,13 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" cp darkplaces-sdl "$out/bin/xonotic-sdl" + cp darkplaces-glx "$out/bin/xonotic-glx" cd ../.. mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" + + # default to sdl + ln -s "$out/bin/xonotic-sdl" "$out/bin/xonotic" ''; dontPatchELF = true; |