Merge pull request #290053 from qubitnano/origin-flexoptix

flexoptix-app: 5.16.0 -> 5.20.0
This commit is contained in:
Janne Heß 2024-02-20 09:52:55 +01:00 committed by GitHub
commit e9d3efd486
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions

View File

@ -1,11 +1,11 @@
{ lib, appimageTools, fetchurl, asar }: let
pname = "flexoptix-app";
version = "5.16.0-latest";
version = "5.20.0-latest";
src = fetchurl {
name = "${pname}-${version}.AppImage";
url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";
hash = "sha256-A10r8IUB3zWKWmjen90vLXPF7V/Cgo+DhFn/Hsc1Nhg=";
hash = "sha256-/4vZaVLpSiufjNwwofPi+YBtTJ4aq7eYgFnYFv89LFY=";
};
udevRules = fetchurl {
@ -19,7 +19,7 @@
# Get rid of the autoupdater
${asar}/bin/asar extract $out/resources/app.asar app
sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js
patch -p0 < ${./disable-autoupdate.patch}
${asar}/bin/asar pack app $out/resources/app.asar
'';
});

View File

@ -0,0 +1,16 @@
--- app/electron/jsComponents/mainWindowEvents.js 2024-02-18 12:53:41.115773007 -0500
+++ app/electron/jsComponents/mainWindowEvents.js2 2024-02-18 23:22:20.003280203 -0500
@@ -128,7 +128,12 @@
if (app.isPackaged) {
global.mainWindow.webContents.once("did-finish-load", function () {
- autoUpdater.checkForUpdates();
+ global.mainWindow.loadURL(
+ url.format({
+ ...global.APPLICATION_URL_OBJECT,
+ slashes: true,
+ }),
+ );
});
} else {
global.mainWindow.webContents.openDevTools();