From bd662930103650e0d569776e6e0566d510e43479 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 15 Apr 2024 13:11:27 +0400
Subject: [PATCH] gitui: migrate to by-name

---
 .../gitui/default.nix => by-name/gi/gitui/package.nix}   | 9 ++++++---
 pkgs/top-level/all-packages.nix                          | 4 ----
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{applications/version-management/gitui/default.nix => by-name/gi/gitui/package.nix} (90%)

diff --git a/pkgs/applications/version-management/gitui/default.nix b/pkgs/by-name/gi/gitui/package.nix
similarity index 90%
rename from pkgs/applications/version-management/gitui/default.nix
rename to pkgs/by-name/gi/gitui/package.nix
index f59249a9796d..edc03effa5fd 100644
--- a/pkgs/applications/version-management/gitui/default.nix
+++ b/pkgs/by-name/gi/gitui/package.nix
@@ -6,8 +6,7 @@
 , openssl
 , pkg-config
 , xclip
-, AppKit
-, Security
+, darwin
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -27,7 +26,11 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ openssl ]
     ++ lib.optional stdenv.isLinux xclip
-    ++ lib.optionals stdenv.isDarwin [ libiconv Security AppKit ];
+    ++ lib.optionals stdenv.isDarwin [
+         libiconv
+         darwin.apple_sdk.frameworks.Security
+         darwin.apple_sdk.frameworks.AppKit
+       ];
 
   postPatch = ''
     # The cargo config overrides linkers for some targets, breaking the build
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e81a4a5acb6..ab71ea43cb3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2528,10 +2528,6 @@ with pkgs;
 
   gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
 
-  gitui = callPackage ../applications/version-management/gitui {
-    inherit (darwin.apple_sdk.frameworks) Security AppKit;
-  };
-
   gitweb = callPackage ../applications/version-management/gitweb { };
 
   glab = callPackage ../applications/version-management/glab { };