Merge master into staging-next

2018-11-30 17:46:21 +01:00
parent 70f5d64cb3 74e283403c
commit 1828a5c5ba
101 changed files with 1225 additions and 601 deletions
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ premake5 doxygen ];
  propagatedBuildInputs = [ libsodium mbedtls ];

-  buildPhase = ''
-    premake5 gmake
-    make all
+  postBuild = ''
    premake5 docs
  '';

@@ -28,6 +26,8 @@ stdenv.mkDerivation rec {
    cp -r docs/html $out/share/doc/yojimbo
  '';

+  doCheck = true;
+
  meta = with stdenv.lib; {
    description = "A network library for client/server games with dedicated servers";
    longDescription = ''