pyrox.dev
Merge pull request #267509 from amarshall/bitwarden-update
+15
-5
pkgs/tools/security/bitwarden/default.nix
+15
-5
pkgs/tools/security/bitwarden/default.nix
···
5
, dbus
6
, electron_25
7
, fetchFromGitHub
8
, glib
9
, gnome
10
, gtk3
···
27
electron = electron_25;
28
in buildNpmPackage rec {
29
pname = "bitwarden";
30
-
version = "2023.10.0";
31
32
src = fetchFromGitHub {
33
owner = "bitwarden";
34
repo = "clients";
35
rev = "desktop-v${version}";
36
-
hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";
37
};
38
39
nodejs = nodejs_18;
40
41
makeCacheWritable = true;
42
npmWorkspace = "apps/desktop";
43
-
npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";
44
45
cargoDeps = rustPlatform.fetchCargoTarball {
46
name = "${pname}-${version}";
47
-
inherit src;
48
sourceRoot = "${src.name}/${cargoRoot}";
49
-
hash = "sha256-I7wENo4cCxcllEyT/tgAavHNwYPrQkPXxg/oTsl/ClA=";
50
};
51
cargoRoot = "apps/desktop/desktop_native";
52
···
5
, dbus
6
, electron_25
7
, fetchFromGitHub
8
+
, fetchpatch2
9
, glib
10
, gnome
11
, gtk3
···
28
electron = electron_25;
29
in buildNpmPackage rec {
30
pname = "bitwarden";
31
+
version = "2023.10.1";
32
33
src = fetchFromGitHub {
34
owner = "bitwarden";
35
repo = "clients";
36
rev = "desktop-v${version}";
37
+
hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws=";
38
};
39
40
+
patches = [
41
+
(fetchpatch2 {
42
+
# https://github.com/bitwarden/clients/issues/6812#issuecomment-1806830091
43
+
url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch";
44
+
hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw=";
45
+
})
46
+
];
47
+
48
nodejs = nodejs_18;
49
50
makeCacheWritable = true;
51
npmWorkspace = "apps/desktop";
52
+
npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc=";
53
54
cargoDeps = rustPlatform.fetchCargoTarball {
55
name = "${pname}-${version}";
56
+
inherit patches src;
57
+
patchFlags = [ "-p4" ];
58
sourceRoot = "${src.name}/${cargoRoot}";
59
+
hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8=";
60
};
61
cargoRoot = "apps/desktop/desktop_native";
62