diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix index 7ec901fbc6486..6f3187cddb27e 100644 --- a/pkgs/by-name/bi/bitwarden-cli/package.nix +++ b/pkgs/by-name/bi/bitwarden-cli/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2024.8.0"; + version = "2024.8.1"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-vosEc8HCMHEaaQadzA+jDjQA1liEtD8sS1Zndz/Iv00="; + hash = "sha256-l9fLh1YFivVcMs688vM0pHoN0Um2r/EDpo7dvwvZFwY="; }; postPatch = '' @@ -27,10 +27,10 @@ buildNpmPackage rec { nodejs = nodejs_20; - npmDepsHash = "sha256-5neEpU7ZhVO5OR181owsvAnFfl7lr0MymvqbRFCPs3M="; + npmDepsHash = "sha256-/6yWdTy6/GvYy8u5eZB+x5KRG6vhPVE0DIn+RUAO5MI="; nativeBuildInputs = [ - python3 + (python3.withPackages (ps: with ps; [ setuptools ])) ] ++ lib.optionals stdenv.isDarwin [ cctools xcbuild.xcrun @@ -38,7 +38,19 @@ buildNpmPackage rec { makeCacheWritable = true; - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + npm_config_build_from_source = "true"; + }; + + # node-argon2 builds with LTO, but that causes missing symbols. So disable it + # and rebuild. See https://github.com/ranisalt/node-argon2/pull/415 + preConfigure = '' + pushd node_modules/argon2 + substituteInPlace binding.gyp --replace-fail '"-flto", ' "" + "$npm_config_node_gyp" rebuild + popd + ''; npmBuildScript = "build:oss:prod";