From e837475e8bab1cd543faf783e18286d7b35efc14 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 18 Jun 2023 18:10:47 +0800 Subject: [PATCH] assimp: fix build for riscv --- pkgs/development/libraries/assimp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index 05f2d439adf..9d57891905a 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { version = "5.2.5"; outputs = [ "out" "lib" "dev" ]; - src = fetchFromGitHub{ + src = fetchFromGitHub { owner = "assimp"; repo = "assimp"; rev = "v${version}"; @@ -23,10 +23,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DASSIMP_BUILD_ASSIMP_TOOLS=ON" ]; - env.NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ([ # Needed with GCC 12 "-Wno-error=array-bounds" - ]; + ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ + "-Wno-error=free-nonheap-object" + ]); meta = with lib; { description = "A library to import various 3D model formats";