From d3a307c813cbd209fe1e13ac9246b3fa3ea93c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 23 Dec 2022 11:10:52 -0600 Subject: [PATCH] =?UTF-8?q?assimp:=205.1.3=20=E2=86=92=205.2.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/assimp/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 804c97ffd747..81d9e54de435 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -1,29 +1,28 @@ -{ 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" ]; + meta = with lib; { description = "A library to import various 3D model formats"; homepage = "https://www.assimp.org/";