From 61660128fd105ae2b2b7fcf615229a97c698b730 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 6 Apr 2023 12:20:36 +0200 Subject: [PATCH] Patch react-native/Yoga to make it possible to build an app using Xcode 14.3 (#15589) * Patch react-native/Yoga to make it possible to build an app using Xcode 14.3 * Update * Update * Comment update * Comment update --- nix/deps/nodejs-patched/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nix/deps/nodejs-patched/default.nix b/nix/deps/nodejs-patched/default.nix index 2cecbf1c11..c4607ebd66 100644 --- a/nix/deps/nodejs-patched/default.nix +++ b/nix/deps/nodejs-patched/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation { "patchBuildIdPhase" "patchHermesPhase" "patchJavaPhase" + "patchYogaNodePackagePhase" "installPhase" ]; @@ -59,6 +60,14 @@ stdenv.mkDerivation { patchJavaPhase = '' ${nodejs}/bin/node ./node_modules/jetifier/bin/jetify ''; + # Patch React Native Yoga.cpp file + # FIXME: Remove this once release newer than 1.19.0 is used which includes: + # https://github.com/facebook/yoga/commit/f174de70 + patchYogaNodePackagePhase = '' + substituteInPlace ./node_modules/react-native/ReactCommon/yoga/yoga/Yoga.cpp --replace \ + 'node->getLayout().hadOverflow() |' \ + 'node->getLayout().hadOverflow() ||' + ''; installPhase = '' mkdir -p $out cp -R node_modules $out/