use prebuilt fmt and json-c (#9)

fcitx-contrib · Jan 6, 2024 · 9447626 · 9447626
1 parent 9cc0306
commit 9447626
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,9 +26,7 @@ jobs:
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
           brew install \
-            fmt \
             extra-cmake-modules \
-            json-c \
             lua \
             ninja
 
@@ -43,8 +41,6 @@ jobs:
             extra-cmake-modules \
             ninja
           arm-brew-install \
-            fmt \
-            json-c \
             gettext \
             lua
           cp -f /usr/local/bin/msgfmt /opt/homebrew/bin

diff --git a/common.sh b/common.sh
@@ -36,7 +36,7 @@ f5m_configure() {
   PKG_CONFIG_PATH=$INSTALL_PREFIX/lib/pkgconfig:$HOMEBREW_PREFIX/lib/pkgconfig cmake -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
     -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
-    -DCMAKE_FIND_ROOT_PATH="/Library/Input Methods/Fcitx5.app/Contents;$HOMEBREW_PREFIX" \
+    -DCMAKE_FIND_ROOT_PATH="/Library/Input Methods/Fcitx5.app/Contents;$INSTALL_PREFIX;$HOMEBREW_PREFIX" \
     -DCMAKE_OSX_ARCHITECTURES=$ARCH "$@"
 }
 

diff --git a/scripts/hallelujah.sh b/scripts/hallelujah.sh
@@ -2,7 +2,7 @@ set -e
 
 . ./common.sh hallelujah $1
 
-install_deps marisa
+install_deps marisa fmt json-c
 f5m_configure -DENABLE_TEST=OFF
 f5m_build
 f5m_install