From 82bb9f42b9d9fbfc07a10b64b6b8a273dc43105d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 22 Oct 2024 18:56:46 -0700
Subject: [PATCH] bitwarden-cli: 2024.9.0 -> 2024.11.0

Diff: https://github.com/bitwarden/clients/compare/cli-v2024.9.0...cli-v2024.11.0

Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2024.10.0
           https://github.com/bitwarden/clients/releases/tag/cli-v2024.11.0
---
 pkgs/by-name/bi/bitwarden-cli/package.nix | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 2fe5a8e36878e..9eaff37058e8b 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -3,22 +3,22 @@
 , buildNpmPackage
 , nodejs_20
 , fetchFromGitHub
-, python3
 , cctools
 , nix-update-script
 , nixosTests
+, perl
 , xcbuild
 }:
 
 buildNpmPackage rec {
   pname = "bitwarden-cli";
-  version = "2024.9.0";
+  version = "2024.11.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "cli-v${version}";
-    hash = "sha256-o5nRG2j73qheDOyeFfSga64D8HbTn1EUrCiN0W+Xn0w=";
+    hash = "sha256-4QTQgW8k3EMf07Xqs2B+VXQOUPzoOgaNvoC02x4zvu8=";
   };
 
   postPatch = ''
@@ -28,12 +28,11 @@ buildNpmPackage rec {
 
   nodejs = nodejs_20;
 
-  npmDepsHash = "sha256-L7/frKCNlq0xr6T+aSqyEQ44yrIXwcpdU/djrhCJNNk=";
+  npmDepsHash = "sha256-YzhCyNMvfXGmgOpl3qWj1Pqd1hY8CJ9QLwQds5ZMnqg=";
 
-  nativeBuildInputs = [
-    (python3.withPackages (ps: with ps; [ setuptools ]))
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     cctools
+    perl
     xcbuild.xcrun
   ];
 
@@ -44,15 +43,6 @@ buildNpmPackage rec {
     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";
 
   npmWorkspace = "apps/cli";