From 7376feb6bb2312d952e80ec5c996218d0c382476 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 4 Dec 2024 11:56:23 +0100
Subject: [PATCH] ripasso-cursive: move to by-name

---
 .../ri/ripasso-cursive}/fix-tests.patch       |  0
 .../ri/ripasso-cursive/package.nix}           | 22 ++++++-------------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 7 insertions(+), 19 deletions(-)
 rename pkgs/{tools/security/ripasso => by-name/ri/ripasso-cursive}/fix-tests.patch (100%)
 rename pkgs/{tools/security/ripasso/cursive.nix => by-name/ri/ripasso-cursive/package.nix} (83%)

diff --git a/pkgs/tools/security/ripasso/fix-tests.patch b/pkgs/by-name/ri/ripasso-cursive/fix-tests.patch
similarity index 100%
rename from pkgs/tools/security/ripasso/fix-tests.patch
rename to pkgs/by-name/ri/ripasso-cursive/fix-tests.patch
diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/by-name/ri/ripasso-cursive/package.nix
similarity index 83%
rename from pkgs/tools/security/ripasso/cursive.nix
rename to pkgs/by-name/ri/ripasso-cursive/package.nix
index 21641754374b..a595a724de2b 100644
--- a/pkgs/tools/security/ripasso/cursive.nix
+++ b/pkgs/by-name/ri/ripasso-cursive/package.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
@@ -11,8 +10,6 @@
   xorg,
   nettle,
   clang,
-  AppKit,
-  Security,
   installShellFiles,
 }:
 
@@ -44,18 +41,13 @@ rustPlatform.buildRustPackage rec {
     rustPlatform.bindgenHook
   ];
 
-  buildInputs =
-    [
-      openssl
-      libgpg-error
-      gpgme
-      xorg.libxcb
-      nettle
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      AppKit
-      Security
-    ];
+  buildInputs = [
+    openssl
+    libgpg-error
+    gpgme
+    xorg.libxcb
+    nettle
+  ];
 
   preCheck = ''
     export HOME=$TMPDIR
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7c3a0a6b7b0..8926c2fe0980 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2696,10 +2696,6 @@ with pkgs;
 
   razergenie = libsForQt5.callPackage ../applications/misc/razergenie { };
 
-  ripasso-cursive = callPackage ../tools/security/ripasso/cursive.nix {
-    inherit (darwin.apple_sdk.frameworks) AppKit Security;
-  };
-
   roundcube = callPackage ../servers/roundcube { };
 
   roundcubePlugins = dontRecurseIntoAttrs (callPackage ../servers/roundcube/plugins { });