Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

teeworlds: 0.6.5 -> 0.7.2 #54412

Merged
merged 2 commits into from Jan 21, 2019
Merged

teeworlds: 0.6.5 -> 0.7.2 #54412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c651d1
bam: 0.4.0 -> 0.5.1, fix licence
lheckemann Jan 21, 2019
64b9677
teeworlds: 0.6.5 -> 0.7.2
lheckemann Jan 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 9 additions & 7 deletions pkgs/development/tools/build-managers/bam/default.nix
View file
Open in desktop
@@ -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'';

Expand All @@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
raskin
];
platforms = platforms.linux;
license = licenses.free;
license = licenses.zlib;
downloadPage = "http://matricks.github.com/bam/";
};
}
36 changes: 24 additions & 12 deletions pkgs/games/teeworlds/default.nix
View file
Open in desktop
@@ -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 = ''
Expand All @@ -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"];
};
}