Merge pull request #281918 from mfrischknecht/fix-foxotron

foxotron: fix build due to deprecated C stdint import in vendored dependency

authored by Cosima Neidahl and committed by GitHub ef178a61 334fe1e6

+16
+16
pkgs/applications/graphics/foxotron/default.nix
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 , nix-update-script 5 , cmake 6 , pkg-config ··· 35 sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; 36 }; 37 38 postPatch = '' 39 substituteInPlace CMakeLists.txt \ 40 --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" 41 ''; 42 43 nativeBuildInputs = [ cmake pkg-config makeWrapper ];
··· 1 { stdenv 2 , lib 3 , fetchFromGitHub 4 + , fetchpatch 5 , nix-update-script 6 , cmake 7 , pkg-config ··· 36 sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; 37 }; 38 39 + patches = [ 40 + (fetchpatch { 41 + name = "0001-assimp-Include-cstdint-for-std-uint32_t.patch"; 42 + url = "https://github.com/assimp/assimp/commit/108e3192a201635e49e99a91ff2044e1851a2953.patch"; 43 + stripLen = 1; 44 + extraPrefix = "externals/assimp/"; 45 + hash = "sha256-rk0EFmgeZVwvx3NJOOob5Jwj9/J+eOtuAzfwp88o+J4="; 46 + }) 47 + ]; 48 + 49 postPatch = '' 50 substituteInPlace CMakeLists.txt \ 51 --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" 52 + 53 + # Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this 54 + # Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this 55 + substituteInPlace externals/assimp/code/CMakeLists.txt \ 56 + --replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' "" 57 ''; 58 59 nativeBuildInputs = [ cmake pkg-config makeWrapper ];