openspades: 0.0.12 -> 0.1.1b

Remove openspades-git, it's not needed now that there was a release.

pkgs/games/openspades/default.nix

@@ -1,49 +1,43 @@
-{ stdenv, lib, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,
-  SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
-
-assert withOpenal -> openal != null;
+{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
+, curl, glew , mesa_noglu, SDL2, SDL2_image, zlib, freetype, imagemagick
+, openal , opusfile, libogg
+}:
 
 stdenv.mkDerivation rec {
   name = "openspades-${version}";
-  version = "0.0.12";
+  version = "0.1.1b";
+  devPakVersion = "33";
 
-  src = fetchurl {
-    url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz";
-    sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";
+  src = fetchFromGitHub {
+    owner = "yvt";
+    repo = "openspades";
+    rev = "v${version}";
+    sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn";
   };
 
-  # https://github.com/yvt/openspades/issues/354
-  postPatch = ''
-    substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
-    substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
-    substituteInPlace Sources/Draw/SWMapRenderer.cpp \
-      --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
-    sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \
-      -i Sources/Draw/SWMapRenderer.cpp
-    sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h
-  '';
+  nativeBuildInputs = [ cmake imagemagick unzip zip file ];
 
-  nativeBuildInputs =
-    [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
-    ++ lib.optional withOpenal openal;
+  buildInputs = [
+    freetype SDL2 SDL2_image mesa_noglu zlib curl glew opusfile openal libogg
+  ];
 
   cmakeFlags = [
     "-DOPENSPADES_INSTALL_BINARY=bin"
-    "-DOPENSPADES_RESOURCES=NO"
   ];
 
+  devPak = fetchurl {
+    url = "https://github.com/yvt/openspades-paks/releases/download/r${devPakVersion}/OpenSpadesDevPackage-r${devPakVersion}.zip";
+    sha256 = "1bd2fyn7mlxa3xnsvzj08xjzw02baimqvmnix07blfhb78rdq9q9";
+  };
+
+  postPatch = ''
+    sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh
+    patchShebangs Resources
+  '';
+
   enableParallelBuilding = true;
 
-  devPack = fetchurl {
-    url = "http://yvt.jp/files/programs/osppaks/DevPaks27.zip";
-    sha256 = "05y7wldg70v5ys41fm0c8kipyspn524z4pglwr3p8h0gfz9n52v6";
-  };
-
-  preBuild = ''
-    unzip -u -o $devPack -d Resources/DevPak
-  '';
-
-  NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
+  NIX_CFLAGS_LINK = [ "-lopenal" ];
 
   meta = with stdenv.lib; {
     description = "A compatible client of Ace of Spades 0.75";

pkgs/games/openspades/git.nix

@@ -1,48 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, 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 = "2016-04-17";
-
-  src = fetchFromGitHub {
-    owner = "yvt";
-    repo = "openspades";
-    rev = "cadc0b6a57fbee05abcaf42d15664502c94b58cf";
-    sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn";
-  };
-
-  postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp";
-
-  nativeBuildInputs =
-    with stdenv.lib;
-    [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
-    ++ lib.optional withOpenal openal;
-
-  cmakeFlags = [
-    "-DOPENSPADES_INSTALL_BINARY=bin"
-    "-DOPENSPADES_RESOURCES=NO"
-  ];
-
-  #enableParallelBuilding = true;
-
-  devPack = fetchurl {
-    url = "http://yvt.jp/files/programs/osppaks/DevPaks29.zip";
-    sha256 = "1fhwxm6wifg0l3ykmiiqa1h4ch5ika2kw2j0v9xnrz24cabsi6cc";
-  };
-
-  preBuild = ''
-    unzip -u -o $devPack -d Resources/DevPak
-  '';
-
-  NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
-
-  meta = with stdenv.lib; {
-    description = "A compatible client of Ace of Spades 0.75";
-    homepage    = "https://github.com/yvt/openspades/";
-    license     = licenses.gpl3;
-    platforms   = platforms.linux;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -16493,9 +16493,7 @@ with pkgs;
 
   openrw = callPackage ../games/openrw { };
 
-  openspades = callPackage ../games/openspades {};
-
-  openspades-git = lowPrio (callPackage ../games/openspades/git.nix {});
+  openspades = callPackage ../games/openspades { };
 
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;