diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/assimp')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/assimp/default.nix | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/development/libraries/assimp/default.nix b/nixpkgs/pkgs/development/libraries/assimp/default.nix index 804c97ffd747..05f2d439adf3 100644 --- a/nixpkgs/pkgs/development/libraries/assimp/default.nix +++ b/nixpkgs/pkgs/development/libraries/assimp/default.nix @@ -1,29 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, boost +, zlib +}: stdenv.mkDerivation rec { pname = "assimp"; - version = "5.1.3"; + version = "5.2.5"; outputs = [ "out" "lib" "dev" ]; src = fetchFromGitHub{ owner = "assimp"; repo = "assimp"; rev = "v${version}"; - hash = "sha256-GNSfaP8O5IsjGwtC3DFaV4OiMMUXIcmHmz+5TCT/HP8="; + hash = "sha256-vQx+PaET5mlvvIGHk6pEnZvM3qw8DiC3hd1Po6OAHxQ="; }; - patches = [ - # Fix include directory with split outputs - # https://github.com/assimp/assimp/pull/4337 - (fetchpatch { - url = "https://github.com/assimp/assimp/commit/5dcaf445c3da079cf43890a0688428a7e1de0b30.patch"; - sha256 = "sha256-KwqTAoDPkhFq469+VaUuGoqfymu2bWLG9W3BvFvyU5I="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost zlib ]; + cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; + + env.NIX_CFLAGS_COMPILE = toString [ + # Needed with GCC 12 + "-Wno-error=array-bounds" + ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/"; |