nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 21:03:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335898 from dotlambda/bitwarden-desktop-24.05

Browse Source 
[24.05] bitwarden-desktop: 2024.4.1 -> 2024.6.4
This commit is contained in:
Robert Schütz 2024-08-22 19:53:59 -07:00 committed by GitHub
commit 29e8e22b42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/by-name/bi/bitwarden-desktop/package.nix
View File

@ -3,7 +3,7 @@
, cargo
, copyDesktopItems
, dbus
, electron_28
, electron_29
, fetchFromGitHub
, glib
, gnome
@ -14,7 +14,7 @@
, makeWrapper
, moreutils
, napi-rs-cli
, nodejs_18
, nodejs_20
, patchutils_0_4_2
, pkg-config
, python3
@ -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.4.1";
version = "2024.6.4";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
hash = "sha256-UzVzo8tq719W2EwUE4NfvUrqhb61fvd60EGkavQmv3Q=";
hash = "sha256-oQ2VZoxePdYUC+xMKlRMpvPubSPULvt31XSh/OBw3Ec=";
};
patches = [
@ -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-qkg1psct/ekIXB6QmJX1n/UOKUhYSD9Su7t/b4/4miM=";
npmDepsHash = "sha256-9d9pWrFYelAx/PPDHY3m92Frp8RSQuBqpiOjmWtm/1g=";
cargoDeps = rustPlatform.fetchCargoTarball {
name = "${pname}-${version}";
@ -76,7 +76,7 @@ in buildNpmPackage rec {
patches;
patchFlags = [ "-p4" ];
sourceRoot = "${src.name}/${cargoRoot}";
hash = "sha256-lvEJmjzhpMhm+9INYHWpdltinUOI3DMtFN/ddDQrUvo=";
hash = "sha256-ZmblY1APVa8moAR1waVBZPhrf5Wt1Gi6dvAxkhizckQ=";
};
cargoRoot = "apps/desktop/desktop_native";
@ -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 \