diff options
| -rw-r--r-- | pkgs/games/super-tux-kart/default.nix | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index a81d7f33d43..351c24f5f79 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,27 +1,26 @@ { stdenv, fetchFromGitHub, fetchsvn, fetchpatch, cmake, pkgconfig , openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype -, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: +, fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet }: let dir = "stk-code"; in stdenv.mkDerivation rec { - name = "supertuxkart-${version}"; - - version = "0.9.3"; + pname = "supertuxkart"; + version = "1.0"; srcs = [ (fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; rev = version; - sha256 = "1smnanjjaj4yq2ywikv0l6xysh6n2h1cm549plbg5xdk9mx2sfia"; + sha256 = "03mrnzrvfdgjc687n718f5zsray6vbdlv4irzy2mfi78bz3bkjll"; name = dir; }) (fetchsvn { url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "17448"; - sha256 = "0lxbb4k57gv4gj12l5hnvhwdycpzcxjwg7qdfwglj2bdvaxf9f21"; + rev = "18212"; + sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; name = "stk-assets"; }) ]; @@ -31,15 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr openal freealut libGLU_combined libvorbis libogg zlib freetype - curl fribidi bluez libjpeg libpng - ]; - - # https://github.com/supertuxkart/stk-code/issues/3557#issuecomment-440794379 - patches = [ - (fetchpatch { - url = "https://github.com/supertuxkart/stk-code/commit/3a3953f38c3555e87f3608d0291dbfccf34e9775.patch"; - sha256 = "13mr5pwf45g7frpxzlxiyiq39qi3z9spd7l6gi8i3dr3li9wrb1k"; - }) + curl fribidi bluez libjpeg libpng enet ]; enableParallelBuilding = true; |