commit b72bf35d0e88768a2f34ae75fe04e59a96241db4 · pyrox.dev/nixpkgs

pkgs/by-name/fl/flexoptix-app/allow-no-secret-manager.patch

···

       1
       1
       +
       --- app/node_modules/rme-electron/main/fo-storage/models/fo-storage-file.js

     

       2
       2
       +
       +++ app/node_modules/rme-electron/main/fo-storage/models/fo-storage-file.js

     

       3
       3
       +
       @@ -25,6 +25,7 @@

     

       4
       4
       +
       		if (!this.#isPlainObject(initialContent)) {

     

       5
       5
       +
       			throw new Error("Content must be a plain object");

     

       6
       6
       +
       		}

     

       7
       7
       +
       +		safeStorage.setUsePlainTextEncryption(true);

     

       8
       8
       +
       		this.#content = initialContent;

     

       9
       9
       +
       	}

+12 -16

pkgs/by-name/fl/flexoptix-app/disable-autoupdate.patch

···

       1
       1
       -
       --- app/electron/jsComponents/mainWindowEvents.js	2024-02-18 12:53:41.115773007 -0500

     

       2
       2
       -
       +++ app/electron/jsComponents/mainWindowEvents.js2	2024-02-18 23:22:20.003280203 -0500

     

       3
       3
       -
       @@ -128,7 +128,12 @@

     

       4
       4
       -
        

     

       5
       5
       -
        	if (app.isPackaged) {

     

       6
       6
       -
        		global.mainWindow.webContents.once("did-finish-load", function () {

     

       7
       7
       -
       -			autoUpdater.checkForUpdates();

     

       8
       8
       -
       +			global.mainWindow.loadURL(

     

       9
       9
       -
       +				url.format({

     

       10
       10
       -
       +					...global.APPLICATION_URL_OBJECT,

     

       11
       11
       -
       +					slashes: true,

     

       12
       12
       -
       +				}),

     

       13
       13
       -
       +			);

     

       14
       14
       -
        		});

     

       15
       15
       -
        	} else {

     

       16
       16
       -
        		global.mainWindow.webContents.openDevTools();

     

       1
       1
       +
       --- app/node_modules/electron-updater/out/AppUpdater.js

     

       2
       2
       +
       +++ app/node_modules/electron-updater/out/AppUpdater.js

     

       3
       3
       +
       @@ -211,6 +211,9 @@

     

       4
       4
       +
             * Asks the server whether there is an update.

     

       5
       5
       +
             */

     

       6
       6
       +
            checkForUpdates() {

     

       7
       7
       +
       +        this.emit("update-not-available", null);

     

       8
       8
       +
       +        return true;

     

       9
       9
       +
       +

     

       10
       10
       +
                if (!this.isUpdaterActive()) {

     

       11
       11
       +
                    return Promise.resolve(null);

     

       12
       12
       +
                }

+21 -5

pkgs/by-name/fl/flexoptix-app/package.nix

···

       3
       3
        
         appimageTools,

     

       4
       4
        
         fetchurl,

     

       5
       5
        
         asar,

     

       6
       6
       +
         python3,

     

       6
       7
        
       }:

     

       7
       8
        
       let

     

       8
       9
        
         pname = "flexoptix-app";

     

       9
       9
       -
         version = "5.21.2-latest";

     

       10
       10
       +
         version = "5.48.0-latest";

     

       10
       11
        
       

     

       11
       12
        
         src = fetchurl {

     

       12
       13
        
           name = "${pname}-${version}.AppImage";

     

       13
       14
        
           url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage";

     

       14
       14
       -
           hash = "sha256-BnNRwD09CE1EZDg3Hn3khN4FZ8Hj5LLAunk+NKU5BJo=";

     

       15
       15
       +
           hash = "sha256-VSGfExus+4dDef6V1ZEATMBVCIb0JS459+yolx5sg3c=";

     

       15
       16
        
         };

     

       16
       17
        
       

     

       17
       18
        
         udevRules = fetchurl {

     

       18
       19
        
           url = "https://www.flexoptix.net/static/frontend/Flexoptix/default/en_US/files/99-tprogrammer.rules";

     

       19
       19
       -
           hash = "sha256-faowRYdrk88WUpOpaEfedzybBgxVRZhvAaYP9HAuzAE=";

     

       20
       20
       +
           hash = "sha256-/1ZtJT+1IMyYqw3N0bVJ/T3vbmex169lzx+SlY5WsnA=";

     

       20
       21
        
         };

     

       21
       22
        
       

     

       22
       23
        
         appimageContents = (appimageTools.extract { inherit pname version src; }).overrideAttrs (oA: {

     

       23
       24
        
           buildCommand = ''

     

       24
       25
        
             ${oA.buildCommand}

     

       25
       26
        
       

     

       26
       26
       -
             # Get rid of the autoupdater

     

       27
       27
       +
             # Remove left-over node-gyp executable symlinks

     

       28
       28
       +
             # https://github.com/nodejs/node-gyp/issues/2713

     

       29
       29
       +
             find $out/ -type l -name python3 -exec ln -sf ${python3.interpreter} {} \;

     

       30
       30
       +
       

     

       31
       31
       +
             # Extract app to make it patchable

     

       27
       32
        
             ${asar}/bin/asar extract $out/resources/app.asar app

     

       33
       33
       +
       

     

       34
       34
       +
             # Fix app crash when none of these secret managers is available: https://www.electronjs.org/docs/latest/api/safe-storage#safestoragegetselectedstoragebackend-linux

     

       35
       35
       +
             patch -p0 < ${./allow-no-secret-manager.patch}

     

       36
       36
       +
             # Get rid of the autoupdater

     

       28
       37
        
             patch -p0 < ${./disable-autoupdate.patch}

     

       38
       38
       +
       

     

       39
       39
       +
             # Makes debugging easier: cp -r app $out/_app

     

       40
       40
       +
       

     

       41
       41
       +
             # Repackage

     

       29
       42
        
             ${asar}/bin/asar pack app $out/resources/app.asar

     

       30
       43
        
           '';

     

       31
       44
        
         });

     
···

       42
       55
        
           install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications

     

       43
       56
        
           install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps

     

       44
       57
        
           substituteInPlace $out/share/applications/flexoptix-app.desktop \

     

       45
       45
       -
             --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --"

     

       58
       58
       +
             --replace-fail 'Exec=AppRun' "Exec=$out/bin/${pname} --"

     

       59
       59
       +
       

     

       60
       60
       +
           # For debugging

     

       61
       61
       +
           [[ -e ${appimageContents}/_app ]] && ln -s ${appimageContents}/_app $out

     

       46
       62
        
       

     

       47
       63
        
           # Add udev rules

     

       48
       64
        
           mkdir -p $out/lib/udev/rules.d