Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/servers/serfdom/default.nix

7 files changed, 196 insertions, 9 deletions

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
new file mode 100644
index 000000000000..6f3c85183da5
--- /dev/null
+++ b/pkgs/games/0ad/data.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, version, releaseType }:
+
+stdenv.mkDerivation rec {
+  name = "0ad-data-${version}";
+
+  src = fetchurl {
+    url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-data.tar.xz";
+    sha256 = "0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc";
+  };
+
+  patchPhase = ''
+    rm binaries/data/tools/fontbuilder/fonts/*.txt
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/0ad
+    cp -r binaries/data/* $out/share/0ad/
+  '';
+}
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
new file mode 100644
index 000000000000..efbd59dbbe3f
--- /dev/null
+++ b/pkgs/games/0ad/default.nix
@@ -0,0 +1,120 @@
+{ stdenv, stdenvType, callPackage, fetchurl, python27
+, pkgconfig, spidermonkey_24, boost, icu, libxml2, libpng
+, libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
+, openalSoft, mesa, xproto, libX11, libXcursor, nspr, SDL
+, gloox, nvidia-texture-tools
+, withEditor ? true, wxGTK ? null
+}:
+
+assert withEditor -> wxGTK != null;
+
+let
+  version = "0.0.16";
+
+  releaseType = "alpha";
+
+  zeroadData = callPackage ./data.nix { inherit version releaseType; };
+
+  archForPremake =
+    if stdenv.lib.hasPrefix "x86_64-" stdenvType then "x64" else
+    if stdenv.lib.hasPrefix "i686-" stdenvType then "x32" else "ERROR";
+
+in
+stdenv.mkDerivation rec {
+  name = "0ad-${version}";
+
+  src = fetchurl {
+    url = "http://releases.wildfiregames.com/0ad-${version}-${releaseType}-unix-build.tar.xz";
+    sha256 = "cb965ef7e292bc3a2f1f598a9695e16ff4d786398f384a1ec7d5f9bfe2626de5";
+  };
+
+  buildInputs = [
+    zeroadData python27 pkgconfig spidermonkey_24 boost icu
+    libxml2 libpng libjpeg zlib curl libogg libvorbis enet
+    miniupnpc openalSoft mesa xproto libX11 libXcursor nspr
+    SDL gloox nvidia-texture-tools
+  ] ++ stdenv.lib.optional withEditor wxGTK;
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${xproto}/include/X11"
+    "-I${libX11}/include/X11"
+    "-I${libXcursor}/include/X11"
+  ];
+
+  configurePhase = ''
+    # Delete shipped libraries which we don't need.
+    rm -rf libraries/source/{enet,miniupnpc,nvtt,spidermonkey}
+
+    # Build shipped premake.
+    make -C build/premake/premake4/build/gmake.unix
+
+    # Run premake.
+    pushd build/premake
+    ./premake4/bin/release/premake4 \
+      --file="premake4.lua" \
+      --outpath="../workspaces/gcc/" \
+      --platform=${archForPremake} \
+      --os=linux \
+      --with-system-nvtt \
+      --with-system-enet \
+      --with-system-miniupnpc \
+      --with-system-mozjs24 \
+      ${ if withEditor then "--atlas" else "" } \
+      --collada \
+      --bindir="$out"/bin \
+      --libdir="$out"/lib/0ad \
+      --datadir="$out"/share/0ad \
+      gmake
+    popd
+  '';
+
+  buildPhase = ''
+    # Build bundled fcollada.
+    make -C libraries/source/fcollada/src
+
+    # Build 0ad.
+    make -C build/workspaces/gcc verbose=1
+  '';
+
+  installPhase = ''
+    # Copy executables.
+    mkdir -p "$out"/bin
+    cp binaries/system/pyrogenesis "$out"/bin/
+    ((${ toString withEditor })) && cp binaries/system/ActorEditor "$out"/bin/
+
+    # Copy l10n data.
+    mkdir -p "$out"/share/0ad
+    cp -r binaries/data/l10n "$out"/share/0ad/
+
+    # Copy libraries.
+    mkdir -p "$out"/lib/0ad
+    cp binaries/system/libCollada.so "$out"/lib/0ad/
+    ((${ toString withEditor })) && cp binaries/system/libAtlasUI.so "$out"/lib/0ad/
+
+    # Create links to data files.
+    ln -s -t "$out"/share/0ad "${zeroadData}"/share/0ad/*
+
+    # Copy icon.
+    mkdir -p "$out"/share/icons
+    cp build/resources/0ad.png "$out"/share/icons/
+
+    # Copy/fix desktop item.
+    mkdir -p "$out"/share/applications
+    while read LINE; do
+      if [[ $LINE = "Exec=0ad" ]]; then
+        echo "Exec=$out/bin/pyrogenesis"
+      elif [[ $LINE = "Icon=0ad" ]]; then
+        echo "Icon=$out/share/icons/0ad.png"
+      else
+        echo "$LINE"
+      fi
+    done <build/resources/0ad.desktop >"$out"/share/applications/0ad.desktop
+  '';
+
+  meta = {
+    description = "A free, open-source game of ancient warfare";
+    homepage = "http://wildfiregames.com/0ad/";
+    license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix
index faf7366f2494..801b7ea72770 100644
--- a/pkgs/games/blobby/default.nix
+++ b/pkgs/games/blobby/default.nix
@@ -1,17 +1,18 @@
-{stdenv, fetchurl, SDL, SDL_image, mesa, cmake, physfs, boost, zip, zlib}:
+{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib
+, pkgconfig}:
 stdenv.mkDerivation rec {
-  version = "1.0-rc3";
+  version = "1.0";
   name = "blobby-volley-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0RC3/blobby2-linux-1.0rc3.tar.gz";
-    sha256 = "10f50b2ygw8cb9mp33wpdwv9p6lc10qlwc1xd44bbcby1d9v5ga5";
+    url = "http://softlayer-ams.dl.sourceforge.net/project/blobby/Blobby%20Volley%202%20%28Linux%29/1.0/blobby2-linux-1.0.tar.gz";
+    sha256 = "1qpmbdlyhfbrdsq4vkb6cb3b8mh27fpizb71q4a21ala56g08yms";
   };
 
-  buildInputs = [SDL SDL_image mesa cmake physfs boost zip zlib];
+  buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib pkgconfig];
 
-  preConfigure = ''
-    sed -re '1i#include <cassert>' -i src/CrossCorrelation.h
+  preConfigure=''
+    sed -e '1i#include <iostream>' -i src/NetworkMessage.cpp
   '';
 
   meta = {
@@ -19,5 +20,8 @@ stdenv.mkDerivation rec {
     license = with stdenv.lib.licenses; bsd3;
     platforms = with stdenv.lib.platforms; linux;
     maintainers = with stdenv.lib.maintainers; [raskin];
+    homepage = "http://blobby.sourceforge.net/";
+    downloadPage = "http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/";
+    inherit version;
   };
 }
diff --git a/pkgs/games/blobby/default.upstream b/pkgs/games/blobby/default.upstream
new file mode 100644
index 000000000000..e9ab417f5d20
--- /dev/null
+++ b/pkgs/games/blobby/default.upstream
@@ -0,0 +1,8 @@
+url http://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/
+SF_version_dir
+version_link '[.]tar[.][^.]+/download$'
+SF_redirect
+do_overwrite(){
+  do_overwrite_just_version
+  set_var_value url $CURRENT_URL
+}
diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix
index c7e594f89bda..1a026132e525 100644
--- a/pkgs/games/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-therapist/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchhg {
     url = "https://code.google.com/r/splintermind-attributes/";
-    tag = rev;
+    inherit rev;
     sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z";
   };
 
diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
new file mode 100644
index 000000000000..7f11fc829032
--- /dev/null
+++ b/pkgs/games/openspades/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,
+  SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
+
+assert withOpenal -> openal != null;
+
+stdenv.mkDerivation rec {
+  name = "openspades-${version}";
+  version = "0.0.12";
+
+  src = fetchurl {
+    url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz";
+    sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";
+  };
+
+  nativeBuildInputs = 
+    with stdenv.lib;
+    [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
+    ++ optional withOpenal openal;
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ];
+
+  # OpenAL is loaded dynamicly
+  postInstall = 
+    if withOpenal then ''
+      wrapProgram "$out/bin/openspades" \
+        --prefix LD_LIBRARY_PATH : "${openal}/lib"
+    '' 
+    else null;
+
+  meta = with stdenv.lib; {
+    description = "OpenSpades is a compatible client of Ace of Spades 0.75";
+    homepage    = "https://github.com/yvt/openspades/";
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix
index 5e2ecdbcc5c7..cfae6a4bb3e8 100644
--- a/pkgs/games/opentyrian/default.nix
+++ b/pkgs/games/opentyrian/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchhg {
     url = "https://opentyrian.googlecode.com/hg/";
-    tag = "13ef8ce47362";
+    rev = "13ef8ce47362";
     md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0";
   };