mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
bitwarden: use electron_26
Upstream uses Electron 25 which is EOL but the app runs fine under Electron 26.
This commit is contained in:
parent
8aeba41cca
commit
47a92aac1e
|
@ -3,7 +3,7 @@
|
|||
, cargo
|
||||
, copyDesktopItems
|
||||
, dbus
|
||||
, electron_25
|
||||
, electron_26
|
||||
, fetchFromGitHub
|
||||
, fetchpatch2
|
||||
, glib
|
||||
|
@ -25,10 +25,10 @@
|
|||
let
|
||||
description = "A secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
electron = electron_25;
|
||||
electron = electron_26;
|
||||
in buildNpmPackage rec {
|
||||
pname = "bitwarden";
|
||||
version = "2023.12.0";
|
||||
version = "2023.12.0"; # TODO add back Electron version check below
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bitwarden";
|
||||
|
@ -82,12 +82,14 @@ in buildNpmPackage rec {
|
|||
libsecret
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# FIXME add back once upstream moves to Electron >= 26
|
||||
# we use electron_26 because electron_25 is EOL
|
||||
/*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
|
||||
'';
|
||||
'';*/
|
||||
|
||||
postBuild = ''
|
||||
pushd apps/desktop
|
||||
|
|
Loading…
Reference in a new issue