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 a5782ce76d4c..57a86a27213d 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 f80f742702fb..4a1c62f30dc1 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 { };