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: e87ace43d5c5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffe50cdf2214
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 2, 2018

  1. teeworlds: 0.6.4 -> 0.6.5 

    This release adds support for building with cmake!
So switch to that eagerly instead of fighting with bam.

(if nothing else cmake is the devil we know...)

Also:

* fixup 'DATA_DIR' so programs can find resources
  (without need for wrappers)
* install readme+license as previously done ("docs")
* don't install tools since not built or installed by default
  * esp since doesn't appear to have non-adhoc method for installation
  * other distros don't seem to include

(cherry picked from commit 18258ba)

Fixes CVE-2018-18541.
    @dtzWill @fpletz
    dtzWill authored and fpletz committed Nov 2, 2018
    Copy the full SHA
    ffe50cd View commit details
Showing with 19 additions and 38 deletions.
  1. +19 −38 pkgs/games/teeworlds/default.nix
57 changes: 19 additions & 38 deletions pkgs/games/teeworlds/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,35 @@
{ fetchurl, stdenv, makeWrapper, python, alsaLib
, libX11, libGLU, SDL, lua5, zlib, bam, freetype
{ fetchurl, stdenv, cmake, pkgconfig, makeWrapper, python, alsaLib
, libX11, libGLU, SDL, lua5, zlib, freetype, wavpack
}:

stdenv.mkDerivation rec {
name = "teeworlds-0.6.4";
name = "teeworlds-0.6.5";

src = fetchurl {
url = "https://downloads.teeworlds.com/teeworlds-0.6.4-src.tar.gz";
sha256 = "1qlqzp4wqh1vnip081lbsjnx5jj5m5y4msrcm8glbd80pfgd2qf2";
url = "https://downloads.teeworlds.com/teeworlds-0.6.5-src.tar.gz";
sha256 = "07llxjc47d1gd9jqj3vf08cmw26ha6189mwcix1khwa3frfbilqb";
};

# we always want to use system libs instead of these
postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}";
postPatch = ''
# we always want to use system libs instead of these
rm -r other/{freetype,sdl}/{include,mac,windows}
buildInputs = [
python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype
];

buildPhase = ''
bam -a -v release
# 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"'
'';

installPhase = ''
# Copy the graphics, sounds, etc.
mkdir -p "$out/share/${name}"
cp -rv data other/icons "$out/share/${name}"
nativeBuildInputs = [ cmake pkgconfig ];

# Copy the executables (client, server, etc.).
mkdir -p "$out/bin"
executables=""
for file in *
do
if [ -f "$file" ] && [ -x "$file" ]
then
executables="$file $executables"
fi
done
cp -v $executables "$out/bin"

# Make sure the programs are executed from the right directory so
# that they can access the graphics and sounds.
for program in $executables
do
wrapProgram $out/bin/$program \
--run "cd $out/share/${name}"
done
buildInputs = [
python alsaLib libX11 libGLU SDL lua5 zlib freetype wavpack
];

# Copy the documentation.
mkdir -p "$out/doc/${name}"
cp -v *.txt "$out/doc/${name}"
postInstall = ''
mkdir -p $out/share/doc/teeworlds
cp -v *.txt $out/share/doc/teeworlds/
'';

meta = {