diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:45:06 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 18:34:53 +0100 |
commit | 9443129b08b37a6f4267d257cd8d42dd92a2539c (patch) | |
tree | aec261361299cc2d85827dbcf5d03b594ae85e28 /pkgs/games | |
parent | f78534ca0f8ec63d79370eb2367605579efba088 (diff) | |
parent | f6d51f7717cffd8b220ce02498db8b8359b5964c (diff) | |
download | nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.gz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.bz2 nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.lz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.xz nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.tar.zst nixlib-9443129b08b37a6f4267d257cd8d42dd92a2539c.zip |
Merge master into stdenv-updates
Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/nexuiz/default.nix | 76 | ||||
-rw-r--r-- | pkgs/games/xonotic/default.nix | 26 |
2 files changed, 97 insertions, 5 deletions
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix new file mode 100644 index 000000000000..e40dec3c23fc --- /dev/null +++ b/pkgs/games/nexuiz/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchurl +, # required for both + unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora +, libogg, libmodplug +, # glx + libX11, mesa, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib +, # sdl + SDL +}: + +let + version = "2.5.2"; + + version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}"; +in stdenv.mkDerivation { + name = "nexuiz-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/nexuiz/nexuiz-${version_short}.zip"; + sha256 = "0010jrxc68qqinkvdh1qn2b8z3sa5v1kcd8d1m4llp3pr6y7xqm5"; + }; + + buildInputs = [ + # required for both + unzip + # glx + libX11 mesa libXpm libXext libXxf86vm libXxf86dga alsaLib + # sdl + SDL + ]; + + postUnpack = '' + cd Nexuiz/sources/ + unzip enginesource*.zip + cd ../../ + ''; + + NIX_LDFLAGS = '' + -rpath ${zlib}/lib + -rpath ${curl}/lib + -rpath ${libjpeg}/lib + -rpath ${libpng}/lib + -rpath ${libvorbis}/lib + -rpath ${libtheora}/lib + -rpath ${libogg}/lib + -rpath ${libmodplug}/lib + ''; + + buildPhase = '' + cd sources/darkplaces/ + DP_FS_BASEDIR="$out/share/nexuiz" + 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 + cd ../../ + ''; + + installPhase = '' + mkdir -pv "$out/bin/" + cp -v sources/darkplaces/darkplaces-glx "$out/bin/nexuiz-glx" + cp -v sources/darkplaces/darkplaces-sdl "$out/bin/nexuiz-sdl" + cp -v sources/darkplaces/darkplaces-dedicated "$out/bin/nexuiz-dedicated" + mkdir -pv "$out/share/nexuiz/" + cp -rv data/ "$out/share/nexuiz/" + ln -s "$out/bin/nexuiz-sdl" "$out/bin/nexuiz" + ''; + + dontPatchELF = true; + + meta = { + description = "A free fast-paced first-person shooter"; + homepage = "http://www.alientrap.org/games/nexuiz"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 137429cdc838..9db82d722d27 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; |