fix: aarch build

libnyanpasu · Sep 1, 2024 · 042f017 · 042f017
1 parent a7a2d83
commit 042f017
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/deps-build-linux.yaml b/.github/workflows/deps-build-linux.yaml
@@ -71,7 +71,9 @@ jobs:
           deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports jammy-security multiverse
           EOF | sudo tee /etc/apt/sources.list.d/arm64.list
           sudo apt update -y && sudo apt upgrade -y
-          sudo apt install libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 libappindicator3-dev:arm64 librsvg2-dev:arm64 patchelf:arm64 openssl:arm64 -y
+          apt-get install -y libncurses6:arm64 libtinfo6:arm64 linux-libc-dev:arm64 libncursesw6:arm64 libssl3:arm64 libcups2:arm64
+          apt-get install -y --no-install-recommends g++-aarch64-linux-gnu libc6-dev-arm64-cross libwebkit2gtk-4.0-dev:arm64 libgtk-3-dev:arm64 patchelf:arm64 librsvg2-dev:arm64 libayatana-appindicator3-dev:arm64
+
       - name: Setup x86_64 Toolchain
         if: ${{ inputs.aarch64 == false }}
         run: |
@@ -97,7 +99,7 @@ jobs:
       - name: Pnpm install deps and download resources
         run: |
           pnpm i
-          ${{ inputs.aarch64 == true && 'pnpm check --arch arm64 --sidecar-host aarch64-apple-darwin' || 'pnpm check' }}
+          ${{ inputs.aarch64 == true && 'pnpm check --arch arm64 --sidecar-host aarch64-unknown-linux-gnu' || 'pnpm check' }}
 
       - name: Nightly Prepare
         if: ${{ inputs.nightly == true }}

diff --git a/frontend/nyanpasu/src/router.ts b/frontend/nyanpasu/src/router.ts
@@ -1,7 +1,7 @@
 // Generouted, changes to this file will be overriden
 /* eslint-disable */
 
-import { components, hooks, utils } from "@generouted/react-router/client";
+import { components, hooks, utils } from '@generouted/react-router/client'
 
 export type Path =
   | `/connections`
@@ -11,16 +11,14 @@ export type Path =
   | `/providers`
   | `/proxies`
   | `/rules`
-  | `/settings`;
+  | `/settings`
 
-export type Params = {};
+export type Params = {
+
+}
 
-export type ModalPath = never;
+export type ModalPath = never
 
-export const { Link, Navigate } = components<Path, Params>();
-export const { useModals, useNavigate, useParams } = hooks<
-  Path,
-  Params,
-  ModalPath
->();
-export const { redirect } = utils<Path, Params>();
+export const { Link, Navigate } = components<Path, Params>()
+export const { useModals, useNavigate, useParams } = hooks<Path, Params, ModalPath>()
+export const { redirect } = utils<Path, Params>()