fix: remove openwork sidecars in preFixup to prevent .opencode-wrapped conflict

This commit is contained in:
m3tm3re
2026-04-03 12:44:45 +02:00
parent ccd2e7df08
commit 53220ae007

View File

@@ -179,10 +179,15 @@ in
pnpm --filter @openwork/app build pnpm --filter @openwork/app build
''; '';
# Tauri installs the binary using productName ("OpenWork") on Linux. # Remove internal Tauri sidecar binaries BEFORE fixupPhase so that
# Rename to lowercase and fix the .desktop Exec= entry. # wrapGAppsHook3 never sees them and never creates .opencode-wrapped
# Also disable WebKit GPU compositing, which breaks Wayland input event # (or similar) files that would conflict with other packages in buildEnv.
# routing and causes clicks to be completely unresponsive. preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
for sidecar in opencode opencode-router openwork-server openwork-orchestrator chrome-devtools-mcp versions.json; do
rm -f "$out/bin/$sidecar"
done
'';
postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
for name in OpenWork "OpenWork-Dev"; do for name in OpenWork "OpenWork-Dev"; do
if [ -f "$out/bin/$name" ]; then if [ -f "$out/bin/$name" ]; then
@@ -194,15 +199,6 @@ in
-exec sed -i 's|^Exec=OpenWork.*|Exec=openwork|' {} + -exec sed -i 's|^Exec=OpenWork.*|Exec=openwork|' {} +
wrapProgram $out/bin/openwork \ wrapProgram $out/bin/openwork \
--set WEBKIT_DISABLE_COMPOSITING_MODE 1 --set WEBKIT_DISABLE_COMPOSITING_MODE 1
# Remove internal Tauri sidecar binaries from $out/bin.
# These (opencode, opencode-router, openwork-server, openwork-orchestrator,
# chrome-devtools-mcp, versions.json) are bundled into the app's resource
# directory at runtime and must NOT be top-level executables they conflict
# with packages (e.g. opencode) that expose the same wrapped binary names.
for sidecar in opencode opencode-router openwork-server openwork-orchestrator chrome-devtools-mcp versions.json; do
rm -f "$out/bin/$sidecar"
done
''; '';
meta = { meta = {