bitwarden: 2023.4.0 -> 2023.5.0
This commit is contained in:
parent
599fd903c4
commit
1111114179
1 changed files with 5 additions and 12 deletions
|
@ -4,7 +4,6 @@
|
||||||
, dbus
|
, dbus
|
||||||
, electron_24
|
, electron_24
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchpatch
|
|
||||||
, glib
|
, glib
|
||||||
, gnome
|
, gnome
|
||||||
, gtk3
|
, gtk3
|
||||||
|
@ -27,29 +26,23 @@ let
|
||||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
|
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; };
|
||||||
electron = electron_24;
|
electron = electron_24;
|
||||||
|
|
||||||
version = "2023.4.0";
|
version = "2023.5.0";
|
||||||
src = applyPatches {
|
src = applyPatches {
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "bitwarden";
|
owner = "bitwarden";
|
||||||
repo = "clients";
|
repo = "clients";
|
||||||
rev = "desktop-v${version}";
|
rev = "desktop-v${version}";
|
||||||
sha256 = "sha256-TTKDl6Py3k+fAy/kcyiMbAAKQdhVnZTyRXV8D/VpKBE=";
|
sha256 = "sha256-ELKpGSY4ZbgSk4vJnTiB+IOa8RQU8Ahy3A1mYsKtthU=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [ ];
|
||||||
# Bump electron to 24 and node to 18
|
|
||||||
(fetchpatch {
|
|
||||||
url = "https://github.com/bitwarden/clients/pull/5205.patch";
|
|
||||||
hash = "sha256-sKSrh8RHXtxGczyZScjTeiGZgTZCQ7f45ULj/j9cp6M=";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
desktop-native = rustPlatform.buildRustPackage {
|
desktop-native = rustPlatform.buildRustPackage {
|
||||||
pname = "bitwarden-desktop-native";
|
pname = "bitwarden-desktop-native";
|
||||||
inherit src version;
|
inherit src version;
|
||||||
sourceRoot = "source-patched/apps/desktop/desktop_native";
|
sourceRoot = "source-patched/apps/desktop/desktop_native";
|
||||||
cargoSha256 = "sha256-VW9DmSh9jvqFCZjH1SAYkydSGjXSVEbv4CmtoJBiw5Y=";
|
cargoSha256 = "sha256-SeK8Nbgenof9vXI2v7tJ5oHiX60kBoR+UNOSJTRHdzk=";
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
pkg-config
|
pkg-config
|
||||||
|
@ -102,7 +95,7 @@ buildNpmPackage' {
|
||||||
npmBuildFlags = [
|
npmBuildFlags = [
|
||||||
"--workspace apps/desktop"
|
"--workspace apps/desktop"
|
||||||
];
|
];
|
||||||
npmDepsHash = "sha256-UXDn09qyM8GwfUiWLDhhyrGFZeKtTRmQArstw+tm5iE=";
|
npmDepsHash = "sha256-G8DEYPjEP3L4s0pr5n2ZTj8kkT0E7Po1BKhZ2hUdJuY=";
|
||||||
|
|
||||||
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue