bitwarden-desktop: backport electron_37 update (#458491)
This commit is contained in:
@@ -5,8 +5,9 @@
|
||||
cargo,
|
||||
copyDesktopItems,
|
||||
darwin,
|
||||
electron_36,
|
||||
electron_37,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
gnome-keyring,
|
||||
jq,
|
||||
llvmPackages_18,
|
||||
@@ -25,7 +26,7 @@
|
||||
let
|
||||
description = "Secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
electron = electron_36;
|
||||
electron = electron_37;
|
||||
|
||||
# argon2 npm dependency is using `std::basic_string<uint8_t>`, which is no longer allowed in LLVM 19
|
||||
buildNpmPackage' = buildNpmPackage.override {
|
||||
@@ -55,6 +56,11 @@ buildNpmPackage' rec {
|
||||
./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
|
||||
./dont-use-platform-triple.patch
|
||||
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/bitwarden/clients/commit/cd56d01894c38cf046a7e44dcacc7e0ff2aa2a37.patch?full_index=1";
|
||||
hash = "sha256-NRZiM+Y/ifh77vS+8mldbiwv/vPDr1JUOJzSu2tFMS8=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -87,7 +93,7 @@ buildNpmPackage' rec {
|
||||
"--ignore-scripts"
|
||||
];
|
||||
npmWorkspace = "apps/desktop";
|
||||
npmDepsHash = "sha256-EPYUGxXhJSwLF1fW5rWMlF6+RNjiVYxZvnT3zg7KW3A=";
|
||||
npmDepsHash = "sha256-Qhj8Lh25vNnJzbUm/M+mKIc6Fa5plSCiy53vjevs7Tc=";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit
|
||||
|
||||
Reference in New Issue
Block a user