Merge pull request #54412 from mayflower/teeworlds-bump

teeworlds: 0.6.5 -> 0.7.2

2 files changed, 33 insertions, 19 deletions

diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index c20431c5e7e0..624821613465 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, lua5, python }:
+{ stdenv, fetchFromGitHub, lua5_3, python }:
 
 stdenv.mkDerivation rec {
   name = "bam-${version}";
-  version = "0.4.0";
+  version = "0.5.1";
 
-  src = fetchurl {
-    url = "http://github.com/downloads/matricks/bam/${name}.tar.bz2";
-    sha256 = "0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn";
+  src = fetchFromGitHub {
+    owner = "matricks";
+    repo = "bam";
+    rev = "v${version}";
+    sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6";
   };
 
-  buildInputs = [ lua5 python ];
+  buildInputs = [ lua5_3 python ];
 
   buildPhase = ''${stdenv.shell} make_unix.sh'';
 
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
       raskin
     ];
     platforms = platforms.linux;
-    license = licenses.free;
+    license = licenses.zlib;
     downloadPage = "http://matricks.github.com/bam/";
   };
 }
diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix
index 58b04821e129..846054765e00 100644
--- a/pkgs/games/teeworlds/default.nix
+++ b/pkgs/games/teeworlds/default.nix
@@ -1,30 +1,42 @@
-{ fetchurl, stdenv, cmake, pkgconfig, makeWrapper, python, alsaLib
-, libX11, libGLU, SDL, lua5, zlib, freetype, wavpack
+{ fetchFromGitHub, fetchurl, stdenv, bam, pkgconfig, makeWrapper, python, alsaLib
+, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack
 }:
 
 stdenv.mkDerivation rec {
-  name = "teeworlds-0.6.5";
+  name = "teeworlds-0.7.2";
 
-  src = fetchurl {
-    url = "https://downloads.teeworlds.com/teeworlds-0.6.5-src.tar.gz";
-    sha256 = "07llxjc47d1gd9jqj3vf08cmw26ha6189mwcix1khwa3frfbilqb";
+  src = fetchFromGitHub {
+    owner = "teeworlds";
+    repo = "teeworlds";
+    rev = "0.7.2";
+    sha256 = "15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93";
   };
 
   postPatch = ''
-    # we always want to use system libs instead of these
-    rm -r other/{freetype,sdl}/{include,mac,windows}
-
     # set compiled-in DATA_DIR so resources can be found
     substituteInPlace src/engine/shared/storage.cpp \
       --replace '#define DATA_DIR "data"' \
                 '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"'
   '';
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ bam pkgconfig ];
+
+  configurePhase = ''
+    bam config
+  '';
+
+  buildPhase = ''
+    bam conf=release
+  '';
 
+  installPhase = ''
+    mkdir -p $out/bin $out/share/teeworlds
+    cp build/x86_64/release/teeworlds{,_srv} $out/bin
+    cp -r build/x86_64/release/data $out/share/teeworlds
+  '';
 
   buildInputs = [
-    python alsaLib libX11 libGLU SDL lua5 zlib freetype wavpack
+    python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
   ];
 
   postInstall = ''
@@ -45,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = https://teeworlds.com/;
     license = "BSD-style, see `license.txt'";
     maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = ["x86_64-linux" "i686-linux"];
   };
 }