From 422e5c7019164241e2cd1bdfdd85075a8455acc2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 6 Apr 2024 04:20:00 +0000
Subject: [PATCH 1/5] bws: fix build on darwin

---
 pkgs/tools/security/bws/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix
index 292e2d3b3030..e4b911706018 100644
--- a/pkgs/tools/security/bws/default.nix
+++ b/pkgs/tools/security/bws/default.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
       openssl
     ]
     ++ lib.optionals stdenv.isDarwin [
-      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
     ];
 
   env = {

From 95974f051cf1900806970ddfa1f22f4357aad857 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 6 Apr 2024 04:20:00 +0000
Subject: [PATCH 2/5] bws: cleanup dependencies

---
 pkgs/tools/security/bws/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix
index e4b911706018..34ab7284e3b5 100644
--- a/pkgs/tools/security/bws/default.nix
+++ b/pkgs/tools/security/bws/default.nix
@@ -29,13 +29,15 @@ rustPlatform.buildRustPackage rec {
   };
 
   nativeBuildInputs = [
-    perl
     pkg-config
+  ] ++ lib.optionals stdenv.isLinux [
+    perl
   ];
 
   buildInputs =
     [
       oniguruma
+    ] ++ lib.optionals stdenv.isLinux [
       openssl
     ]
     ++ lib.optionals stdenv.isDarwin [

From 6ecf48c9367a28839f2d9c8d58b742472a35533b Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 6 Apr 2024 04:20:00 +0000
Subject: [PATCH 3/5] bws: install completions

---
 pkgs/tools/security/bws/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix
index 34ab7284e3b5..86ee953c0bdc 100644
--- a/pkgs/tools/security/bws/default.nix
+++ b/pkgs/tools/security/bws/default.nix
@@ -1,6 +1,7 @@
 { lib
 , rustPlatform
 , fetchFromGitHub
+, installShellFiles
 , pkg-config
 , oniguruma
 , openssl
@@ -29,6 +30,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   nativeBuildInputs = [
+    installShellFiles
     pkg-config
   ] ++ lib.optionals stdenv.isLinux [
     perl
@@ -51,6 +53,13 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "crates/bws";
 
+  postInstall = ''
+    installShellCompletion --cmd bws \
+      --bash <($out/bin/bws completions bash) \
+      --fish <($out/bin/bws completions fish) \
+      --zsh <($out/bin/bws completions zsh)
+  '';
+
   meta = {
     changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/CHANGELOG.md";
     description = "Bitwarden Secrets Manager CLI";

From 141841383366711433ff165a6a98ccd6584cd673 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 6 Apr 2024 04:20:00 +0000
Subject: [PATCH 4/5] bws: build with `--package`

---
 pkgs/tools/security/bws/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix
index 86ee953c0bdc..551afb609e09 100644
--- a/pkgs/tools/security/bws/default.nix
+++ b/pkgs/tools/security/bws/default.nix
@@ -51,7 +51,9 @@ rustPlatform.buildRustPackage rec {
     RUSTONIG_SYSTEM_LIBONIG = true;
   };
 
-  buildAndTestSubdir = "crates/bws";
+  cargoBuildFlags = [ "--package" "bws" ];
+
+  cargoTestFlags = [ "--package" "bws" ];
 
   postInstall = ''
     installShellCompletion --cmd bws \

From efd178f2071cc2edcbbb05959e430ba0f45f30e2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 6 Apr 2024 04:20:00 +0000
Subject: [PATCH 5/5] bws: update meta

---
 pkgs/tools/security/bws/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/bws/default.nix b/pkgs/tools/security/bws/default.nix
index 551afb609e09..aef7a39de280 100644
--- a/pkgs/tools/security/bws/default.nix
+++ b/pkgs/tools/security/bws/default.nix
@@ -63,9 +63,9 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
-    changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/bitwarden/sdk/blob/${src.rev}/crates/bws/CHANGELOG.md";
     description = "Bitwarden Secrets Manager CLI";
-    homepage = "https://github.com/bitwarden/sdk";
+    homepage = "https://bitwarden.com/help/secrets-manager-cli/";
     license = lib.licenses.unfree; # BITWARDEN SOFTWARE DEVELOPMENT KIT LICENSE AGREEMENT
     mainProgram = "bws";
     maintainers = with lib.maintainers; [ dit7ya ];