bitwarden-desktop: fix build on macOS (#530348)
This commit is contained in:
@@ -9,7 +9,6 @@
|
||||
fetchFromGitHub,
|
||||
gnome-keyring,
|
||||
jq,
|
||||
llvmPackages_18,
|
||||
makeDesktopItem,
|
||||
makeWrapper,
|
||||
nix-update-script,
|
||||
@@ -25,13 +24,8 @@ let
|
||||
description = "Secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
electron = electron_39;
|
||||
|
||||
# argon2 npm dependency is using `std::basic_string<uint8_t>`, which is no longer allowed in LLVM 19
|
||||
buildNpmPackage' = buildNpmPackage.override {
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
|
||||
};
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
buildNpmPackage rec {
|
||||
pname = "bitwarden-desktop";
|
||||
version = "2026.5.0";
|
||||
|
||||
@@ -153,7 +147,8 @@ buildNpmPackage' rec {
|
||||
npm exec electron-builder -- \
|
||||
--dir \
|
||||
-c.electronDist=electron-dist \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronVersion=${electron.version} \
|
||||
${lib.optionalString stdenv.hostPlatform.isDarwin "-c.mac.identity=null"}
|
||||
|
||||
popd
|
||||
'';
|
||||
|
||||
Reference in New Issue
Block a user