Merge pull request #102407 from petabyteboy/feature/stk-1-2

superTuxKart: 1.1 -> 1.2
This commit is contained in:
Linus Heckemann 2020-12-14 22:38:26 +01:00 committed by GitHub
commit dd95aa337e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,14 +1,14 @@
{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper
, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype, glew
, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, harfbuzz
{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper
, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz
, mcpp, wiiuse, angelscript
}:
let
dir = "stk-code";
assets = fetchsvn {
url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
rev = "18212";
sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf";
rev = "18218";
sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw";
name = "stk-assets";
};
@ -33,17 +33,19 @@ let
"libraqm"
# Not packaged to this date
"libsquish"
# Not packaged to this date
"sheenbidi"
];
in stdenv.mkDerivation rec {
pname = "supertuxkart";
version = "1.1";
version = "1.2";
src = fetchFromGitHub {
owner = "supertuxkart";
repo = "stk-code";
rev = version;
sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp";
sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6";
name = dir;
};
@ -53,12 +55,10 @@ in stdenv.mkDerivation rec {
find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {}
'';
nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ];
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
buildInputs = [
libX11 libXrandr
openal freealut libGLU libGL libvorbis libogg zlib freetype glew
curl fribidi bluez libjpeg libpng harfbuzz
SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz
mcpp wiiuse angelscript
];
@ -68,6 +68,7 @@ in stdenv.mkDerivation rec {
"-DCHECK_ASSETS=OFF"
"-DUSE_SYSTEM_WIIUSE=ON"
"-DUSE_SYSTEM_ANGELSCRIPT=ON"
"-DOpenGL_GL_PREFERENCE=GLVND"
];
# Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds