From f61a77af314e52587f267576cd139d4dd5087ccb Mon Sep 17 00:00:00 2001 From: Alois Date: Mon, 6 Jul 2026 23:50:48 +0200 Subject: [PATCH] (fix): workflows --- apps/electron/package.json | 2 ++ flake.nix | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/apps/electron/package.json b/apps/electron/package.json index 7246c18..f1e948f 100644 --- a/apps/electron/package.json +++ b/apps/electron/package.json @@ -5,6 +5,7 @@ "description": "Tensamin desktop client", "author": "methanium", "homepage": "https://git.methanium.net/tensamin/client", + "desktopName": "Tensamin", "type": "module", "main": "dist/main/main.js", "scripts": { @@ -71,6 +72,7 @@ "executableName": "tensamin", "category": "Network", "maintainer": "Methanium", + "syncDesktopName": true, "desktop": { "entry": { "Name": "Tensamin", diff --git a/flake.nix b/flake.nix index c46fbac..11a53a2 100644 --- a/flake.nix +++ b/flake.nix @@ -207,6 +207,17 @@ }; commonDeps = [rustToolchain pkgs.wasm-pack pkgs.lld]; + appImageToolsArchive = pkgs.fetchurl { + url = "https://github.com/electron-userland/electron-builder-binaries/releases/download/appimage@1.0.3/appimage-tools-runtime-20251108.tar.gz"; + hash = "sha256-hAIaeO4hSub9M6LWKpK6JVQt0QvIa/EXqbLQu6ROdmU="; + }; + appImageTools = pkgs.runCommand "electron-builder-appimage-tools-nix" {nativeBuildInputs = [pkgs.gnutar pkgs.gzip];} '' + mkdir -p "$out" + tar -xzf ${appImageToolsArchive} --strip-components=1 -C "$out" + rm -f "$out/mksquashfs" "$out/desktop-file-validate" + ln -s ${pkgs.squashfsTools}/bin/mksquashfs "$out/mksquashfs" + ln -s ${pkgs.desktop-file-utils}/bin/desktop-file-validate "$out/desktop-file-validate" + ''; in rec { default = electron; @@ -244,6 +255,7 @@ export npm_config_build_from_source=true export USE_SYSTEM_FPM=true export ELECTRON_BUILDER_7ZIP_PATH="${pkgs.p7zip}/bin/7za" + export APPIMAGE_TOOLS_PATH="${appImageTools}" alias electron-install='cd "$(git rev-parse --show-toplevel 2>/dev/null || pwd)" && pnpm install' alias electron-build-web='cd "$(git rev-parse --show-toplevel 2>/dev/null || pwd)" && pnpm run build:web'