Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions app.fluxer.Fluxer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ modules:
build-commands:
- ln -s ./pnpm.cjs ../pnpm/bin/pnpm
# For disabling automatic detection for pnpm
- pnpm install --ignore-scripts --frozen-lockfile --offline
- pnpm install --ignore-scripts --frozen-lockfile --offline --force
- pnpm build
- |
set -eux
. ../flatpak-node/electron-builder-arch-args.sh
electron-builder --config ./electron-builder.config.cjs --linux --dir $ELECTRON_BUILDER_ARCH_ARGS
- mv dist-electron/linux-unpacked $FLATPAK_DEST/fluxer
- mv dist-electron/linux*-unpacked $FLATPAK_DEST/fluxer
# Inject the correct Flatpak App ID directly into the Electron archive:
- patch-desktop-filename ${FLATPAK_DEST}/fluxer/resources/app.asar
- install -Dm755 ${FLATPAK_ID}.sh ${FLATPAK_DEST}/bin/${FLATPAK_ID}
Expand All @@ -59,6 +59,9 @@ modules:
disable-submodules: true
- type: patch
path: fix.patch
- type: patch
path: arm-fix.patch
only-arches: [aarch64]
- type: file
path: app.fluxer.Fluxer.sh
dest: fluxer_desktop
Expand Down
17 changes: 17 additions & 0 deletions arm-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/fluxer_desktop/src/main/IpcHandlers.tsx b/fluxer_desktop/src/main/IpcHandlers.tsx
index 60118812..8555bd3e 100644
--- a/fluxer_desktop/src/main/IpcHandlers.tsx
+++ b/fluxer_desktop/src/main/IpcHandlers.tsx
@@ -42,7 +42,11 @@ import type {
PublicKeyCredentialDescriptor,
PublicKeyCredentialRequestOptions,
} from '@electron-webauthn/native';
-import {create as nativeCreate, get as nativeGet, isSupported as nativeIsSupported} from '@electron-webauthn/native';
+const {
+ create: nativeCreate,
+ get: nativeGet,
+ isSupported: nativeIsSupported,
+} = {create: () => Promise.resolve(), get: () => Promise.resolve(), isSupported: () => Promise.resolve(false)};
import type {
AuthenticationExtensionsClientOutputs,
AuthenticationResponseJSON,