Unverified Commit a46bee7c authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #284584 from mfrischknecht/fix-fbjni-build

fbjni: fix broken build due to missing `cstdint` include
parents cb8d00f6 de6b5953
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -19,12 +19,20 @@ stdenv.mkDerivation rec {
  };

  patches = [
    # Upstram fix for builds on GCC 13. Should be removable with next release after 0.5.1
    (fetchpatch {
      name = "add-cstdint-include.patch";
      url = "https://github.com/facebookincubator/fbjni/commit/59461eff6c7881d58e958287481e1f1cd99e08d3.patch";
      hash = "sha256-r27C+ODTCZdd1tEz3cevnNNyZlrRhq1jOzwnIYlkglM=";
    })

    # Part of https://github.com/facebookincubator/fbjni/pull/76
    # fix cmake file installation directory
    (fetchpatch {
      url = "https://github.com/facebookincubator/fbjni/commit/ab02e60b5da28647bfcc864b0bb1b9a90504cdb1.patch";
      sha256 = "sha256-/h6kosulRH/ZAU2u0zRSaNDK39jsnFt9TaSxyBllZqM=";
    })

    # install headers
    (fetchpatch {
      url = "https://github.com/facebookincubator/fbjni/commit/74e125caa9a815244f1e6bd08eaba57d015378b4.patch";