From 1ed49e3ea9201a6f932bcbe79e3cc1c32a5f9fc6 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 23 Nov 2020 22:08:37 +0100 Subject: [PATCH] voxelands: 1512.00 -> 1704.00 --- pkgs/games/voxelands/default.nix | 51 ++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index 93f7e9bffa6..5e52cba3b49 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,13 +1,30 @@ -{ stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, xlibsWrapper, pkgconfig }: +{ stdenv +, fetchFromGitLab +, bzip2 +, cmake +, expat +, irrlicht +, libGL +, libGLU +, libXxf86vm +, libjpeg +, libpng +, libvorbis +, openal +, pkg-config +, sqlite +, xlibsWrapper +}: stdenv.mkDerivation rec { pname = "voxelands"; - version = "1512.00"; + version = "1704.00"; - src = fetchurl { - url = "http://voxelands.com/downloads/${pname}-${version}-src.tar.bz2"; - sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw"; + src = fetchFromGitLab { + owner = pname; + repo = pname; + rev = version; + sha256 = "0yj9z9nygpn0z63y739v72l3kg81wd71xgix5k045vfzhqsam5m0"; }; cmakeFlags = [ @@ -16,16 +33,32 @@ stdenv.mkDerivation rec { "-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG" ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ - cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm libGLU libGL openal libvorbis xlibsWrapper pkgconfig + bzip2 + expat + irrlicht + libGL + libGLU + libXxf86vm + libjpeg + libpng + libvorbis + openal + sqlite + xlibsWrapper ]; meta = with stdenv.lib; { - homepage = "http://voxelands.com/"; + homepage = "https://voxelands.net/"; description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; + broken = stdenv.isAarch64; # build fails with "libIrrlicht.so: undefined reference to `png_init_filter_functions_neon'" }; }