diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index e342d8ab6c09..219c8df803b7 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "assimp-${version}"; - version = "3.3.1"; + version = "4.1.0"; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc"; + sha256 = "00g61g3ixmfszzjncpvm8x7gp2livaj4lmhbycjmrw4x3gfqlc4r"; }; buildInputs = [ cmake boost zlib ]; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 51f2b6a8c4e4..c0053088db76 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,38 +1,35 @@ -{ fetchFromGitHub, stdenv, automake, curl, libsigcxx, SDL2 -, SDL2_image, freetype, libvorbis, libpng, assimp, mesa -, autoconf, pkgconfig }: +{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig +, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, mesa +}: -let - version = "20160116"; - checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r"; -in stdenv.mkDerivation rec { name = "pioneer-${version}"; + version = "20171001"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = checksum; + sha256 = "0yxw1zdvidrwc28vxfi3qpx2nq2dix2d6ylwgzq9ph8kgwv9fl5n"; }; - buildInputs = [ - automake curl libsigcxx SDL2 SDL2_image freetype libvorbis - libpng assimp mesa autoconf pkgconfig - ]; + nativeBuildInputs = [ autoconf automake pkgconfig ]; + + buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp mesa ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" ]; - preConfigure = '' export PIONEER_DATA_DIR="$out/share/pioneer/data"; ./bootstrap ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { - description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century"; + description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = https://pioneerspacesim.net; license = with licenses; [ gpl3 cc-by-sa-30