Commit 5ff0ef51 authored by Manuel Frischknecht's avatar Manuel Frischknecht Committed by Manuel Frischknecht
Browse files

foxotron: fetch assimp patches to fix build 



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: default avatarCosima Neidahl <opna2608@protonmail.com>
parent 27a65c2b

pkgs/applications/graphics/foxotron/default.nix

+16 −0
Original line number Diff line number Diff line 
{ 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 ];