From 64c6a504ce6b5996293462d1ecd07571e4839488 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 27 Aug 2024 14:02:29 -0400
Subject: [PATCH 1/2] bitwarden-desktop: 2024.8.0 -> 2024.8.1

Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.8.0...desktop-v2024.8.1

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.8.1
---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 2ce70a8372cf..22dc15d6f71b 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -28,13 +28,13 @@ let
   electron = electron_31;
 in buildNpmPackage rec {
   pname = "bitwarden-desktop";
-  version = "2024.8.0";
+  version = "2024.8.1";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-szIa7fASDmeWKZPc6HtHKeXKerCAXrYZQWTVFMugAxk=";
+    hash = "sha256-FBNqgPjWSY8SCIGyKpoOl7I3pWQxDbWiFtcPZScDE4A=";
   };
 
   patches = [
@@ -46,7 +46,7 @@ in buildNpmPackage rec {
   makeCacheWritable = true;
   npmFlags = [ "--engine-strict" "--legacy-peer-deps" ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-5neEpU7ZhVO5OR181owsvAnFfl7lr0MymvqbRFCPs3M=";
+  npmDepsHash = "sha256-8cxhor90GqgO34AD8Jhd3N7PCnBnbhg8h7agVq0i3jk=";
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${pname}-${version}";
@@ -62,7 +62,7 @@ in buildNpmPackage rec {
       patches;
     patchFlags = [ "-p4" ];
     sourceRoot = "${src.name}/${cargoRoot}";
-    hash = "sha256-ya/5z5XpsyuWayziLxuETu/dY8LzZspaAMqL2p8jYN8=";
+    hash = "sha256-zc5AarCbrJixcin8t+Ws8fH0ULM9rp3sUFsDb0htPuM=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 

From e91e3c03069b6ce56dd94d87ce2c69728d21fc99 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 27 Aug 2024 16:35:30 -0400
Subject: [PATCH 2/2] bitwarden-desktop: ensure no unfree source is used

---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index 22dc15d6f71b..f6ab725b1536 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -41,6 +41,11 @@ in buildNpmPackage rec {
     ./electron-builder-package-lock.patch
   ];
 
+  postPatch = ''
+    # remove code under unfree license
+    rm -r bitwarden_license
+  '';
+
   nodejs = nodejs_20;
 
   makeCacheWritable = true;