From de6b59532ca3f8443570e79ced4bdc1537158458 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Sun, 28 Jan 2024 17:07:29 +0000 Subject: [PATCH] fbjni: fix broken build due to missing `cstdint` include GCC 13 stopped transitively including `cstdint` in various scenarios, breaking the build of `fbjni`. This issue has already been resolved upstream but is currently only merged in `main` [1] (there hasn't been a subsequent release yet). This change pulls in the respective commit as a patch, fixing the build until a new version of `fbjni` is relased. [1]: https://github.com/facebookincubator/fbjni/commit/59461eff6c7881d58e958287481e1f1cd99e08d3 --- pkgs/development/libraries/fbjni/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/fbjni/default.nix b/pkgs/development/libraries/fbjni/default.nix index 1a5228f4d860..20d47cac1fa3 100644 --- a/pkgs/development/libraries/fbjni/default.nix +++ b/pkgs/development/libraries/fbjni/default.nix @@ -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";