dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #54412 from mayflower/teeworlds-bump

Browse Source 
teeworlds: 0.6.5 -> 0.7.2
This commit is contained in:
Jörg Thalheim 2019-01-21 15:33:21 +00:00 committed by GitHub
commit e6af830961
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/tools/build-managers/bam/default.nix
View File

@ -1,15 +1,17 @@
{ stdenv, fetchurl, lua5, python }: { stdenv, fetchFromGitHub, lua5_3, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bam-${version}"; name = "bam-${version}";
version = "0.4.0"; version = "0.5.1";
src = fetchurl { src = fetchFromGitHub {
url = "http://github.com/downloads/matricks/bam/${name}.tar.bz2"; owner = "matricks";
sha256 = "0z90wvyd4nfl7mybdrv9dsd4caaikc6fxw801b72gqi1m9q0c0sn"; repo = "bam";
rev = "v${version}";
sha256 = "13br735ig7lygvzyfd15fc2rdygrqm503j6xj5xkrl1r7w2wipq6";
}; };
buildInputs = [ lua5 python ]; buildInputs = [ lua5_3 python ];
buildPhase = ''${stdenv.shell} make_unix.sh''; buildPhase = ''${stdenv.shell} make_unix.sh'';
@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
raskin raskin
]; ];
platforms = platforms.linux; platforms = platforms.linux;
license = licenses.free; license = licenses.zlib;
downloadPage = "http://matricks.github.com/bam/"; downloadPage = "http://matricks.github.com/bam/";
}; };
} }

36
pkgs/games/teeworlds/default.nix
View File

@ -1,30 +1,42 @@
{ fetchurl, stdenv, cmake, pkgconfig, makeWrapper, python, alsaLib { fetchFromGitHub, fetchurl, stdenv, bam, pkgconfig, makeWrapper, python, alsaLib
, libX11, libGLU, SDL, lua5, zlib, freetype, wavpack , libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "teeworlds-0.6.5"; name = "teeworlds-0.7.2";
src = fetchurl { src = fetchFromGitHub {
url = "https://downloads.teeworlds.com/teeworlds-0.6.5-src.tar.gz"; owner = "teeworlds";
sha256 = "07llxjc47d1gd9jqj3vf08cmw26ha6189mwcix1khwa3frfbilqb"; repo = "teeworlds";
rev = "0.7.2";
sha256 = "15l988qcsqgb6rjais0qd5sd2rjanm2708jmzvkariqzz0d6pb93";
}; };
postPatch = '' 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 # set compiled-in DATA_DIR so resources can be found
substituteInPlace src/engine/shared/storage.cpp \ substituteInPlace src/engine/shared/storage.cpp \
--replace '#define DATA_DIR "data"' \ --replace '#define DATA_DIR "data"' \
'#define DATA_DIR "${placeholder "out"}/share/teeworlds/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 = [ buildInputs = [
python alsaLib libX11 libGLU SDL lua5 zlib freetype wavpack python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack
]; ];
postInstall = '' postInstall = ''
@ -45,6 +57,6 @@ stdenv.mkDerivation rec {
homepage = https://teeworlds.com/; homepage = https://teeworlds.com/;
license = "BSD-style, see `license.txt'"; license = "BSD-style, see `license.txt'";
maintainers = with stdenv.lib.maintainers; [ astsmtl ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = with stdenv.lib.platforms; linux; platforms = ["x86_64-linux" "i686-linux"];
}; };
} }