Skip to content

bitwarden-desktop: Build desktop proxy #425477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamcstephens merged 1 commit into from
Aug 26, 2025
Merged

bitwarden-desktop: Build desktop proxy #425477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkgs/by-name/bi/bitwarden-desktop/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ buildNpmPackage' rec {

# ensures `app.getPath("exe")` returns our wrapper, not ${electron}/bin/electron
./set-exe-path.patch
# ensure that the desktop proxy is correctly located in libexec
./set-desktop-proxy-path.patch
# on linux: don't flip fuses, don't create wrapper script, on darwin: don't try copying safari extensions, don't try re-signing app
./skip-afterpack-and-aftersign.patch
# since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
Expand All @@ -60,6 +62,8 @@ buildNpmPackage' rec {
rm -r bitwarden_license

substituteInPlace apps/desktop/src/main.ts --replace-fail '%%exePath%%' "$out/bin/bitwarden"
substituteInPlace apps/desktop/src/main/native-messaging.main.ts \
--replace-fail '%%desktopProxyPath%%' "$out/libexec/desktop_proxy"

# force canUpdate to false
# will open releases page instead of trying to update files
Expand Down Expand Up @@ -133,6 +137,10 @@ buildNpmPackage' rec {
pushd apps/desktop/desktop_native/napi
npm run build
popd

pushd apps/desktop/desktop_native/proxy
cargo build --bin desktop_proxy --release -j $NIX_BUILD_CORES --offline
popd
'';

postBuild = ''
Expand Down Expand Up @@ -176,6 +184,8 @@ buildNpmPackage' rec {

installPhase = ''
runHook preInstall

install -Dm755 -t $out/libexec apps/desktop/desktop_native/target/release/desktop_proxy
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/Applications
Expand Down
13 changes: 13 additions & 0 deletions pkgs/by-name/bi/bitwarden-desktop/set-desktop-proxy-path.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/apps/desktop/src/main/native-messaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts
index 30f3e03..6bbf96f 100644
--- a/apps/desktop/src/main/native-messaging.main.ts
+++ b/apps/desktop/src/main/native-messaging.main.ts
@@ -500,7 +500,7 @@ export class NativeMessagingMain {
}
}

- return path.join(path.dirname(this.exePath), `desktop_proxy${ext}`);
+ return "%%desktopProxyPath%%";
}

private homedir() {
Loading