Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 6 additions & 9 deletions pkgs/by-name/bi/bitwarden-desktop/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
nodejs_20,
patchutils_0_4_2,
pkg-config,
python3,
runCommand,
rustc,
rustPlatform,
Expand All @@ -40,13 +39,13 @@ let
in
buildNpmPackage rec {
pname = "bitwarden-desktop";
version = "2024.11.1";
version = "2024.12.0";

src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8=";
hash = "sha256-1XzIrZOTcFEuY/WqPGcFESBAZOiFcHA4ZvGXhDM7a54=";
};

patches = [
Expand All @@ -71,11 +70,10 @@ buildNpmPackage rec {
"--legacy-peer-deps"
];
npmWorkspace = "apps/desktop";
npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg=";
npmDepsHash = "sha256-EtIcqbubAYN9I9wbw17oHiVshd3GtQayFtdgqWP7Pgg=";

cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
inherit src;
cargoDeps = rustPlatform.fetchCargoVendor {
inherit pname version src;
patches = map (
patch:
runCommand (builtins.baseNameOf patch) { nativeBuildInputs = [ patchutils_0_4_2 ]; } ''
Expand All @@ -84,7 +82,7 @@ buildNpmPackage rec {
) patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-aurjpVzWET30O+ysyE4ZzauMe8kHjOL169tfKUR1Vpg=";
hash = "sha256-Fh6pbmFof/qIhVETtBA1fGlC45fuu1n7g9hosvmfHZc=";
};
cargoRoot = "apps/desktop/desktop_native";

Expand All @@ -97,7 +95,6 @@ buildNpmPackage rec {
makeWrapper
napi-rs-cli
pkg-config
(python3.withPackages (ps: with ps; [ setuptools ]))
rustc
rustPlatform.cargoCheckHook
rustPlatform.cargoSetupHook
Expand Down