Skip to content

bitwarden-desktop: 2024.5.0 -> 2024.6.0 #319327

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
SuperSandro2000 merged 3 commits into from
Jun 13, 2024
Merged

bitwarden-desktop: 2024.5.0 -> 2024.6.0 #319327

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7521ac
bitwarden-desktop: minor cleanup
amarshall Jun 13, 2024
d62d943
bitwarden-desktop: enforce using correct Node version
amarshall Jun 13, 2024
8b99f45
bitwarden-desktop: 2024.5.0 -> 2024.6.0
amarshall Jun 12, 2024
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
22 changes: 11 additions & 11 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 @@ -3,7 +3,7 @@
, cargo
, copyDesktopItems
, dbus
, electron_28
, electron_29
, fetchFromGitHub
, glib
, gnome
Expand All @@ -14,7 +14,7 @@
, makeWrapper
, moreutils
, napi-rs-cli
, nodejs_18
, nodejs_20
, patchutils_0_4_2
, pkg-config
, python3
Expand All @@ -24,18 +24,18 @@
}:

let
description = "A secure and free password manager for all of your devices";
description = "Secure and free password manager for all of your devices";
icon = "bitwarden";
electron = electron_28;
electron = electron_29;
in buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.5.0";
version = "2024.6.0";

src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-ozR46snGD5yl98FslmnTeQmd2on/0bQPEnqJ0t8wx70=";
hash = "sha256-qiUUrs23WHE3+KFsWDknuDSA6M3Zwjz9Jdjq6mn5XkE=";
};

patches = [
Expand All @@ -55,12 +55,12 @@ in buildNpmPackage rec {
| ${moreutils}/bin/sponge apps/desktop/src/package-lock.json
'';

nodejs = nodejs_18;
nodejs = nodejs_20;

makeCacheWritable = true;
npmFlags = [ "--legacy-peer-deps" ];
npmFlags = [ "--engine-strict" "--legacy-peer-deps" ];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-gprJGOE/uSSM3NHpcbelB7sueObEl4o522WRHIRFmwo=";
npmDepsHash = "sha256-Mgd15eFJtWoBqFFCsjmsnlNbcg5NDs1U7DlMkE0hIb8=";

cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
Expand All @@ -76,7 +76,7 @@ in buildNpmPackage rec {
patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-FA7B+bipYSxwIGvn/v9+wG3Km6lrwV58LbxsMlDK8q0=";
hash = "sha256-BL+j2hMwb3QGgS29Y6LjqnKscH+tEXMCOyivilHHwVI=";
};
cargoRoot = "apps/desktop/desktop_native";

Expand Down Expand Up @@ -159,7 +159,7 @@ in buildNpmPackage rec {
cp -r locales resources{,.pak} $out/opt/Bitwarden
popd

makeWrapper '${electron}/bin/electron' "$out/bin/bitwarden" \
makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
--add-flags $out/opt/Bitwarden/resources/app.asar \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
--set-default ELECTRON_IS_DEV 0 \
Expand Down