Merge pull request #32587 from tristan0x/assimp4

assimp: 3.3.1 -> 4.1.0

1 files changed, 12 insertions, 15 deletions

diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
index 51f2b6a8c4e..c0053088db7 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 }:
-
-let
-  version = "20160116";
-  checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r";
-in
+{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig
+, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, mesa
+}:
+
 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