silicon: rfc140 - move to pkgs/by-name

NixOS · Jan 25, 2024 · 71ed791 · 71ed791
1 parent 3cd7bc4
commit 71ed791
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/pkgs/tools/misc/silicon/Cargo.lock → pkgs/by-name/si/silicon/Cargo.lock b/pkgs/tools/misc/silicon/Cargo.lock → pkgs/by-name/si/silicon/Cargo.lock
diff --git a/pkgs/tools/misc/silicon/default.nix → pkgs/by-name/si/silicon/package.nix b/pkgs/tools/misc/silicon/default.nix → 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
@@ -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 { };