diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-06-18 18:10:47 +0800 |
|---|---|---|
| committer | Nick Cao <nickcao@nichi.co> | 2023-06-18 18:13:10 +0800 |
| commit | e837475e8bab1cd543faf783e18286d7b35efc14 (patch) | |
| tree | fcc9098d7d160536da648dc45a6b7a6b01b411fd | |
| parent | 30c0a2f73819cc71ff5ff270f6ae4aaafaf954ea (diff) | |
| download | nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.tar nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.tar.gz nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.tar.bz2 nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.tar.lz nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.tar.xz nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.tar.zst nixpkgs-e837475e8bab1cd543faf783e18286d7b35efc14.zip | |
assimp: fix build for riscv
| -rw-r--r-- | pkgs/development/libraries/assimp/default.nix | 8 |
1 files 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"; |