Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b856b24bfaf4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 24f531a3ab6d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 17, 2020

  1. teeworlds: cmake instead of bam, oh joy! cleanup

    @dtzWill
    dtzWill committed Jan 17, 2020
    Copy the full SHA
    5da8903 View commit details

Commits on Jan 26, 2020

  1. teeworlds: meta touchups, per reviewer suggestion

    @dtzWill
    dtzWill committed Jan 26, 2020
    Copy the full SHA
    dd763ca View commit details

  2. Merge pull request #77842 from dtzWill/feature/teeworlds-cmake-hooray 

    teeworlds: cmake instead of bam, oh joy! cleanup
    @dtzWill
    dtzWill authored Jan 26, 2020
    Copy the full SHA
    24f531a View commit details
Showing with 4 additions and 27 deletions.
  1. +4 −27 pkgs/games/teeworlds/default.nix
31 changes: 4 additions & 27 deletions pkgs/games/teeworlds/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";

@@ -60,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;
};
}