Merge pull request #14307 from acowley/assimp

assimp: add missing zlib dependency
This commit is contained in:
joachifm 2016-03-29 20:33:25 +00:00
commit bff64a3c10

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, cmake, boost }: { stdenv, fetchurl, unzip, cmake, boost, zlib }:
let let
major = "3"; major = "3";
@ -14,14 +14,14 @@ stdenv.mkDerivation {
sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s"; sha256 = "17nyzsqzqpafamhi779f1bkh5mfgj8rpas034x3v9a0hdy3jg66s";
}; };
buildInputs = [ unzip cmake boost ]; buildInputs = [ unzip cmake boost zlib ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A library to import various 3D model formats"; description = "A library to import various 3D model formats";
homepage = http://assimp.sourceforge.net/; homepage = http://assimp.sourceforge.net/;
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ehmry ]; maintainers = with maintainers; [ ehmry ];
platfroms = platforms.linux; platfroms = [ platforms.linux platforms.darwin ];
inherit version; inherit version;
}; };
} }