From 5da89034f9f6b0ea29696a3336e095e2e8e04b57 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 Jan 2020 12:51:57 -0600 Subject: [PATCH 1/2] teeworlds: cmake instead of bam, oh joy! cleanup --- pkgs/games/teeworlds/default.nix | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index ceb90809904..9e85714940c 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, bam, pkgconfig, python, alsaLib +{ fetchFromGitHub, stdenv, cmake, pkgconfig, python, alsaLib , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack }: @@ -21,35 +21,12 @@ stdenv.mkDerivation rec { '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' ''; - nativeBuildInputs = [ bam pkgconfig ]; - - configurePhase = '' - runHook preConfigure - bam config - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - bam conf=release - runHook postBuild - ''; - - 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 - ''; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack ]; - postInstall = '' - mkdir -p $out/share/doc/teeworlds - cp -v *.txt $out/share/doc/teeworlds/ - ''; - meta = { description = "Retro multiplayer shooter game"; From dd763ca418c3bb0776c7e71efb9f36670f6aa0c0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 26 Jan 2020 16:45:49 -0600 Subject: [PATCH 2/2] teeworlds: meta touchups, per reviewer suggestion --- pkgs/games/teeworlds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 9e85714940c..ff0dfad51a6 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { Flag. You can even design your own maps! ''; - homepage = https://teeworlds.com/; + homepage = "https://teeworlds.com/"; license = "BSD-style, see `license.txt'"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = stdenv.lib.platforms.linux; }; }