pyrox.dev
Merge pull request #102407 from petabyteboy/feature/stk-1-2
superTuxKart: 1.1 -> 1.2
authored by Linus Heckemann and committed by GitHub dd95aa33 71191178
+12
-11
pkgs/games/super-tux-kart/default.nix
+12
-11
pkgs/games/super-tux-kart/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper
2
-
, openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype, glew
3
-
, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, harfbuzz
1
+
{ lib, stdenv, fetchFromGitHub, fetchsvn, cmake, pkg-config, makeWrapper
2
+
, SDL2, glew, openal, libvorbis, libogg, curl, freetype, bluez, libjpeg, libpng, enet, harfbuzz
4
3
, mcpp, wiiuse, angelscript
5
4
}:
5
+
6
6
let
7
7
dir = "stk-code";
8
8
assets = fetchsvn {
9
9
url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
10
-
rev = "18212";
11
-
sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf";
10
+
rev = "18218";
11
+
sha256 = "11iv3cqzvbjg33zz5i5gkl2syn6mlw9wqv0jc7h36vjnjqjv17xw";
12
12
name = "stk-assets";
13
13
};
14
14
···
33
33
"libraqm"
34
34
# Not packaged to this date
35
35
"libsquish"
36
+
# Not packaged to this date
37
+
"sheenbidi"
36
38
];
37
39
in stdenv.mkDerivation rec {
38
40
39
41
pname = "supertuxkart";
40
-
version = "1.1";
42
+
version = "1.2";
41
43
42
44
src = fetchFromGitHub {
43
45
owner = "supertuxkart";
44
46
repo = "stk-code";
45
47
rev = version;
46
-
sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp";
48
+
sha256 = "1f98whk0v45jgwcsbdsb1qfambvrnbbgwq0w28kjz4278hinwzq6";
47
49
name = dir;
48
50
};
49
51
···
53
55
find lib -maxdepth 1 -type d | egrep -v "^lib$|${(lib.concatStringsSep "|" bundledLibraries)}" | xargs -n1 -L1 -r -I{} rm -rf {}
54
56
'';
55
57
56
-
nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ];
58
+
nativeBuildInputs = [ cmake pkg-config makeWrapper ];
57
59
58
60
buildInputs = [
59
-
libX11 libXrandr
60
-
openal freealut libGLU libGL libvorbis libogg zlib freetype glew
61
-
curl fribidi bluez libjpeg libpng harfbuzz
61
+
SDL2 glew openal libvorbis libogg freetype curl bluez libjpeg libpng enet harfbuzz
62
62
mcpp wiiuse angelscript
63
63
];
64
64
···
68
68
"-DCHECK_ASSETS=OFF"
69
69
"-DUSE_SYSTEM_WIIUSE=ON"
70
70
"-DUSE_SYSTEM_ANGELSCRIPT=ON"
71
+
"-DOpenGL_GL_PREFERENCE=GLVND"
71
72
];
72
73
73
74
# Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds