BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

foxotron: fetch assimp patches to fix build

Browse source 
Foxotron vendors a lot of dependencies (see the `external` directory and
the various submodules it contains). One of them (`FBX`) fails to build
with current versions of GCC because the compiler cannot resolve the
type `std::uint32_t`. The affected file still imports the type via
`#include <stdint.h>`, which has been superseded by `#include <cstdint>`
in C++11.

The upstream patch applied here fixes this build issue by introducing
the missing include line of `<cstdint>`.

The new addition to `postPatch` disables a `-Werror` setting that
(currently) seemingly only causes assimp builds failures on darwin.

Co-authored-by: Cosima Neidahl <opna2608@protonmail.com>
This commit is contained in:
Manuel Frischknecht 2024-01-19 01:25:41 +01:00 committed by Manuel Frischknecht
parent 27a65c2b26
commit 5ff0ef514f
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/applications/graphics/foxotron/default.nix
View file

@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, nix-update-script
, cmake
, pkg-config
@ -35,9 +36,24 @@ stdenv.mkDerivation rec {
sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw=";
};
patches = [
(fetchpatch {
name = "0001-assimp-Include-cstdint-for-std-uint32_t.patch";
url = "https://github.com/assimp/assimp/commit/108e3192a201635e49e99a91ff2044e1851a2953.patch";
stripLen = 1;
extraPrefix = "externals/assimp/";
hash = "sha256-rk0EFmgeZVwvx3NJOOob5Jwj9/J+eOtuAzfwp88o+J4=";
})
];
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" ""
# Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this
# Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this
substituteInPlace externals/assimp/code/CMakeLists.txt \
--replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' ""
'';
nativeBuildInputs = [ cmake pkg-config makeWrapper ];