From e18aee47b356f621c9dac8fdbd8c66b56f7ef222 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 25 Nov 2024 01:20:44 -0500
Subject: [PATCH 1/2] rbw: nix-fmt rfc style

---
 pkgs/by-name/rb/rbw/package.nix | 96 +++++++++++++++++----------------
 1 file changed, 51 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index 5f9419cf5ac7..9d7566c7d314 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -1,26 +1,26 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchzip
-, openssl
-, pkg-config
-, installShellFiles
-, darwin
-, bash
-
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchzip,
+  openssl,
+  pkg-config,
+  installShellFiles,
+  darwin,
+  bash,
   # rbw-fzf
-, withFzf ? false
-, fzf
-, perl
+  withFzf ? false,
+  fzf,
+  perl,
 
   # rbw-rofi
-, withRofi ? false
-, rofi
-, xclip
+  withRofi ? false,
+  rofi,
+  xclip,
 
   # pass-import
-, withPass ? false
-, pass
+  withPass ? false,
+  pass,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -38,39 +38,45 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
-  buildInputs = [ bash ] # for git-credential-rbw
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk_11_0.frameworks.Security
-    darwin.apple_sdk_11_0.frameworks.AppKit
-  ];
+  buildInputs =
+    [ bash ] # for git-credential-rbw
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk_11_0.frameworks.Security
+      darwin.apple_sdk_11_0.frameworks.AppKit
+    ];
 
   preConfigure = lib.optionalString stdenv.hostPlatform.isLinux ''
     export OPENSSL_INCLUDE_DIR="${openssl.dev}/include"
     export OPENSSL_LIB_DIR="${lib.getLib openssl}/lib"
   '';
 
-  postInstall = ''
-    install -Dm755 -t $out/bin bin/git-credential-rbw
-  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd rbw \
-      --bash <($out/bin/rbw gen-completions bash) \
-      --fish <($out/bin/rbw gen-completions fish) \
-      --zsh <($out/bin/rbw gen-completions zsh)
-  '' + lib.optionalString withFzf ''
-    install -Dm755 -t $out/bin bin/rbw-fzf
-    substituteInPlace $out/bin/rbw-fzf \
-      --replace fzf ${fzf}/bin/fzf \
-      --replace perl ${perl}/bin/perl
-  '' + lib.optionalString withRofi ''
-    install -Dm755 -t $out/bin bin/rbw-rofi
-    substituteInPlace $out/bin/rbw-rofi \
-      --replace rofi ${rofi}/bin/rofi \
-      --replace xclip ${xclip}/bin/xclip
-  '' + lib.optionalString withPass ''
-    install -Dm755 -t $out/bin bin/pass-import
-    substituteInPlace $out/bin/pass-import \
-      --replace pass ${pass}/bin/pass
-  '';
+  postInstall =
+    ''
+      install -Dm755 -t $out/bin bin/git-credential-rbw
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd rbw \
+        --bash <($out/bin/rbw gen-completions bash) \
+        --fish <($out/bin/rbw gen-completions fish) \
+        --zsh <($out/bin/rbw gen-completions zsh)
+    ''
+    + lib.optionalString withFzf ''
+      install -Dm755 -t $out/bin bin/rbw-fzf
+      substituteInPlace $out/bin/rbw-fzf \
+        --replace fzf ${fzf}/bin/fzf \
+        --replace perl ${perl}/bin/perl
+    ''
+    + lib.optionalString withRofi ''
+      install -Dm755 -t $out/bin bin/rbw-rofi
+      substituteInPlace $out/bin/rbw-rofi \
+        --replace rofi ${rofi}/bin/rofi \
+        --replace xclip ${xclip}/bin/xclip
+    ''
+    + lib.optionalString withPass ''
+      install -Dm755 -t $out/bin bin/pass-import
+      substituteInPlace $out/bin/pass-import \
+        --replace pass ${pass}/bin/pass
+    '';
 
   meta = with lib; {
     description = "Unofficial command line client for Bitwarden";

From 68eacce4f7a58a4de6e1b7b843c25a29f0df91c1 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 25 Nov 2024 01:21:07 -0500
Subject: [PATCH 2/2] rbw: fix darwin build

---
 pkgs/by-name/rb/rbw/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index 9d7566c7d314..7e3776be7575 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -8,6 +8,7 @@
   installShellFiles,
   darwin,
   bash,
+  apple-sdk_11,
   # rbw-fzf
   withFzf ? false,
   fzf,
@@ -41,6 +42,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs =
     [ bash ] # for git-credential-rbw
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_11 # Needs _NSPasteboardTypeFileURL, can be removed once x86_64-darwin defaults to a higher SDK
       darwin.apple_sdk_11_0.frameworks.Security
       darwin.apple_sdk_11_0.frameworks.AppKit
     ];