(fix): builds

.forgejo/workflows/deploy-dev.yml

@@ -155,7 +155,15 @@ jobs:
           EOF
 
       - name: Build Electron desktop
-        run: nix develop .#electron --command pnpm run build:desktop
+        run: |
+          nix develop .#electron --command bash <<'EOF'
+          set -euo pipefail
+          SEVEN_ZIP_DIR="$(mktemp -d)"
+          mkdir -p "$SEVEN_ZIP_DIR/bin"
+          ln -s "$(command -v 7za)" "$SEVEN_ZIP_DIR/bin/7za"
+          cd apps/electron
+          pnpm run package:raw -- -c.toolsets.sevenZip.url="file://$SEVEN_ZIP_DIR"
+          EOF
 
       - name: Upload desktop artifacts
         uses: https://data.forgejo.org/actions/upload-artifact@v3

.forgejo/workflows/deploy-prod.yml

@@ -154,7 +154,15 @@ jobs:
           EOF
 
       - name: Build Electron desktop
-        run: nix develop .#electron --command pnpm run build:desktop
+        run: |
+          nix develop .#electron --command bash <<'EOF'
+          set -euo pipefail
+          SEVEN_ZIP_DIR="$(mktemp -d)"
+          mkdir -p "$SEVEN_ZIP_DIR/bin"
+          ln -s "$(command -v 7za)" "$SEVEN_ZIP_DIR/bin/7za"
+          cd apps/electron
+          pnpm run package:raw -- -c.toolsets.sevenZip.url="file://$SEVEN_ZIP_DIR"
+          EOF
 
       - name: Upload desktop artifacts
         uses: https://data.forgejo.org/actions/upload-artifact@v3

apps/tauri/package.json

@@ -21,9 +21,9 @@
     "dev:mobile:raw": "tauri android dev --host ${TAURI_DEV_HOST:-127.0.0.1}",
     "start-adb:mobile:raw": "adb devices",
     "build:mobile:raw": "tauri android build",
-    "dev:mobile": "if command -v nix >/dev/null 2>&1; then nix develop ../..#tauri --command pnpm run dev:mobile:raw; else pnpm run dev:mobile:raw; fi",
+    "dev:mobile": "if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop ../..#tauri --command pnpm run dev:mobile:raw; else pnpm run dev:mobile:raw; fi",
-    "start-adb:mobile": "if command -v nix >/dev/null 2>&1; then nix develop ../..#tauri --command pnpm run start-adb:mobile:raw; else pnpm run start-adb:mobile:raw; fi",
+    "start-adb:mobile": "if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop ../..#tauri --command pnpm run start-adb:mobile:raw; else pnpm run start-adb:mobile:raw; fi",
-    "build:mobile": "node render-version.ts && if command -v nix >/dev/null 2>&1; then nix develop ../..#tauri --command pnpm run build:mobile:raw; else pnpm run build:mobile:raw; fi && node render-version.ts --unrender",
+    "build:mobile": "node render-version.ts && trap 'node render-version.ts --unrender' EXIT && if command -v nix >/dev/null 2>&1 && [ -z \"$IN_NIX_SHELL\" ]; then nix develop ../..#tauri --command pnpm run build:mobile:raw; else pnpm run build:mobile:raw; fi",
     "gen-icons": "tauri icon ./logo.json && node scripts/sync-electron-icons.ts",
     "format": "pnpm exec prettier --write .",
     "lint": "eslint src"

apps/tauri/render-version.ts

@@ -1,9 +1,12 @@
 import fs from "fs";
 import path from "path";
+import { fileURLToPath } from "url";
 
 // Config
 const PLACEHOLDER_VERSION = "0.0.0";
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
 const rootPackageJsonPath = path.resolve(__dirname, "../../package.json");
 const cargoTomlPath = path.resolve(__dirname, "./src-tauri/Cargo.toml");
 const tauriConfigPath = path.resolve(__dirname, "./src-tauri/tauri.conf.json");

flake.nix

@@ -233,6 +233,7 @@
             fakeroot
             rsync
             xz
+            p7zip
           ]
           ++ electronRuntimeLibs ++ commonDeps;