public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32587 from tristan0x/assimp4 

assimp: 3.3.1 -> 4.1.0
This commit is contained in:
Orivej Desh 2017-12-17 13:40:39 +00:00 committed by GitHub
parent f1b4fe39af 25dbba0bf2
commit 0fdb4473f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/assimp/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "assimp-${version}"; name = "assimp-${version}";
version = "3.3.1"; version = "4.1.0";
src = fetchFromGitHub{ src = fetchFromGitHub{
owner = "assimp"; owner = "assimp";
repo = "assimp"; repo = "assimp";
rev = "v${version}"; rev = "v${version}";
sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc"; sha256 = "00g61g3ixmfszzjncpvm8x7gp2livaj4lmhbycjmrw4x3gfqlc4r";
}; };
buildInputs = [ cmake boost zlib ]; buildInputs = [ cmake boost zlib ];

25
pkgs/games/pioneer/default.nix
View File

@ -1,38 +1,35 @@
{ fetchFromGitHub, stdenv, automake, curl, libsigcxx, SDL2 { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig
, SDL2_image, freetype, libvorbis, libpng, assimp, mesa , curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, mesa
, autoconf, pkgconfig }: }:
let
version = "20160116";
checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pioneer-${version}"; name = "pioneer-${version}";
version = "20171001";
src = fetchFromGitHub{ src = fetchFromGitHub{
owner = "pioneerspacesim"; owner = "pioneerspacesim";
repo = "pioneer"; repo = "pioneer";
rev = version; rev = version;
sha256 = checksum; sha256 = "0yxw1zdvidrwc28vxfi3qpx2nq2dix2d6ylwgzq9ph8kgwv9fl5n";
}; };
buildInputs = [ nativeBuildInputs = [ autoconf automake pkgconfig ];
automake curl libsigcxx SDL2 SDL2_image freetype libvorbis
libpng assimp mesa autoconf pkgconfig buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp mesa ];
];
NIX_CFLAGS_COMPILE = [ NIX_CFLAGS_COMPILE = [
"-I${SDL2}/include/SDL2" "-I${SDL2}/include/SDL2"
]; ];
preConfigure = '' preConfigure = ''
export PIONEER_DATA_DIR="$out/share/pioneer/data"; export PIONEER_DATA_DIR="$out/share/pioneer/data";
./bootstrap ./bootstrap
''; '';
enableParallelBuilding = true;
meta = with stdenv.lib; { 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; homepage = https://pioneerspacesim.net;
license = with licenses; [ license = with licenses; [
gpl3 cc-by-sa-30 gpl3 cc-by-sa-30