From 7e50f350d3099403a3a3c00aa362125e1fad3bc6 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 9 May 2023 18:34:51 -0400 Subject: [PATCH] bitwarden: verify Electron version matches expected --- pkgs/tools/security/bitwarden/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 2785a4d928a..9a78b698f7a 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -2,7 +2,7 @@ , applyPatches , buildNpmPackage , dbus -, electron +, electron_24 , fetchFromGitHub , fetchpatch , glib @@ -25,6 +25,7 @@ let icon = "bitwarden"; buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_18; }; + electron = electron_24; version = "2023.4.0"; src = applyPatches { @@ -113,6 +114,11 @@ buildNpmPackage' { ]; preBuild = '' + if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then + echo 'ERROR: electron version mismatch' + exit 1 + fi + jq 'del(.scripts.postinstall)' apps/desktop/package.json | sponge apps/desktop/package.json jq '.scripts.build = ""' apps/desktop/desktop_native/package.json | sponge apps/desktop/desktop_native/package.json cp ${desktop-native}/lib/libdesktop_native.so apps/desktop/desktop_native/desktop_native.linux-x64-musl.node