From 71ed7911084dd1a6107114d3f4bb1567c46c13dd Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Tue, 23 Jan 2024 20:10:10 +0100
Subject: [PATCH] silicon: rfc140 - move to pkgs/by-name

---
 pkgs/{tools/misc => by-name/si}/silicon/Cargo.lock    |  0
 .../default.nix => by-name/si/silicon/package.nix}    | 11 +++++++----
 pkgs/top-level/all-packages.nix                       |  4 ----
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{tools/misc => by-name/si}/silicon/Cargo.lock (100%)
 rename pkgs/{tools/misc/silicon/default.nix => by-name/si/silicon/package.nix} (88%)

diff --git a/pkgs/tools/misc/silicon/Cargo.lock b/pkgs/by-name/si/silicon/Cargo.lock
similarity index 100%
rename from pkgs/tools/misc/silicon/Cargo.lock
rename to pkgs/by-name/si/silicon/Cargo.lock
diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/by-name/si/silicon/package.nix
similarity index 88%
rename from pkgs/tools/misc/silicon/default.nix
rename to pkgs/by-name/si/silicon/package.nix
index a5782ce76d4c8..57a86a27213d4 100644
--- a/pkgs/tools/misc/silicon/default.nix
+++ b/pkgs/by-name/si/silicon/package.nix
@@ -10,9 +10,7 @@
 , libxcb
 , python3
 , libiconv
-, AppKit
-, CoreText
-, Security
+, darwin
 , fira-code
 , fontconfig
 , harfbuzz
@@ -38,7 +36,12 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ expat freetype fira-code fontconfig harfbuzz ]
     ++ lib.optionals stdenv.isLinux [ libxcb ]
-    ++ lib.optionals stdenv.isDarwin [ libiconv AppKit CoreText Security ];
+    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+      libiconv
+      AppKit
+      CoreText
+      Security
+    ]);
 
   nativeBuildInputs = [ cmake pkg-config rustPlatform.bindgenHook ]
     ++ lib.optionals stdenv.isLinux [ python3 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f80f742702fb4..4a1c62f30dc1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20031,10 +20031,6 @@ with pkgs;
 
   sigrok-cli = callPackage ../development/tools/sigrok-cli { };
 
-  silicon = callPackage ../tools/misc/silicon {
-    inherit (darwin.apple_sdk.frameworks) AppKit CoreText Security;
-  };
-
   simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { };
 
   slimerjs = callPackage ../development/tools/slimerjs { };