From f93ef45af5f7af043273a75ec708f083294ea125 Mon Sep 17 00:00:00 2001
From: George Harker <george@george-graphics.co.uk>
Date: Sun, 5 Nov 2023 07:00:03 -0800
Subject: [PATCH] fix universal build

---
 NvimServer/NvimServer/bin/build_libnvim.sh    | 5 +++--
 NvimServer/NvimServer/bin/build_nvimserver.sh | 4 ++--
 NvimServer/NvimServer/bin/prepare_libintl.sh  | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NvimServer/NvimServer/bin/build_libnvim.sh b/NvimServer/NvimServer/bin/build_libnvim.sh
index 5ecad9b9..bb8c6d59 100755
--- a/NvimServer/NvimServer/bin/build_libnvim.sh
+++ b/NvimServer/NvimServer/bin/build_libnvim.sh
@@ -9,8 +9,8 @@ build_libnvim() {
   # Brew's gettext does not get sym-linked to PATH
   export PATH="/opt/homebrew/opt/gettext/bin:/usr/local/opt/gettext/bin:${PATH}"
 
-  #macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64\;x86_64"
-  macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64"
+  macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64\;x86_64"
+  #macos_flags="-DCMAKE_OSX_DEPLOYMENT_TARGET=${deployment_target} -DCMAKE_OSX_ARCHITECTURES=arm64"
 
   pushd ../Neovim
 
@@ -20,6 +20,7 @@ build_libnvim() {
     SDKROOT="$(xcrun --show-sdk-path)" \
     MACOSX_DEPLOYMENT_TARGET="${deployment_target}" \
     CMAKE_EXTRA_FLAGS="" \
+    CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
     DEPS_CMAKE_FLAGS="${macos_flags}" \
     libnvim nvim 
 
diff --git a/NvimServer/NvimServer/bin/build_nvimserver.sh b/NvimServer/NvimServer/bin/build_nvimserver.sh
index ecb96c8f..6042f51b 100755
--- a/NvimServer/NvimServer/bin/build_nvimserver.sh
+++ b/NvimServer/NvimServer/bin/build_nvimserver.sh
@@ -17,8 +17,8 @@ main() {
       ./NvimServer/bin/build_libnvim.sh
     fi
 
-    #swift build --arch arm64 --arch x86_64 -c release --product NvimServer
-    swift build --arch arm64 -c release --product NvimServer
+    swift build --arch arm64 --arch x86_64 -c release --product NvimServer
+    #swift build --arch arm64 -c release --product NvimServer
 
   popd >/dev/null
   echo "### Built NvimServer"
diff --git a/NvimServer/NvimServer/bin/prepare_libintl.sh b/NvimServer/NvimServer/bin/prepare_libintl.sh
index af937a1f..e6d07508 100755
--- a/NvimServer/NvimServer/bin/prepare_libintl.sh
+++ b/NvimServer/NvimServer/bin/prepare_libintl.sh
@@ -20,6 +20,7 @@ main() {
     pushd ./NvimServer/third-party >/dev/null
       brew fetch --bottle-tag="${arm64_bottle}" gettext
       brew fetch --bottle-tag="${x86_64_bottle}" gettext
+      brew fetch --bottle-tag="${arm64_bottle}" lua
       brew fetch --bottle-tag="${x86_64_bottle}" lua 
 
       local version; version=$(brew info gettext --json | jq -r ".[0].versions.stable"); readonly version