From 3835c5a3f81305447e4ebe4e00340f12c6830b2f Mon Sep 17 00:00:00 2001
From: Vinny Meller <vinnymeller@proton.me>
Date: Wed, 13 Nov 2024 22:10:41 -0500
Subject: [PATCH] bite: 0.2.1 -> 0.3, fix x86_64-darwin build

---
 pkgs/by-name/bi/bite/Cargo.lock  | 23 ++++++++++++++++++++---
 pkgs/by-name/bi/bite/package.nix | 24 +++++++++++-------------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/bi/bite/Cargo.lock b/pkgs/by-name/bi/bite/Cargo.lock
index a6a1e33f62b9..8d2e476fd228 100644
--- a/pkgs/by-name/bi/bite/Cargo.lock
+++ b/pkgs/by-name/bi/bite/Cargo.lock
@@ -104,6 +104,7 @@ name = "arm"
 version = "0.0.0"
 dependencies = [
  "bitvec",
+ "config",
  "debugvault",
  "decoder",
  "tokenizing",
@@ -381,7 +382,7 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
 [[package]]
 name = "bite"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
  "commands",
  "debugvault",
@@ -696,8 +697,6 @@ dependencies = [
  "egui",
  "log 0.0.0",
  "once_cell",
- "serde",
- "serde_yaml",
  "triple_accel",
 ]
 
@@ -710,6 +709,18 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "config"
+version = "0.0.0"
+dependencies = [
+ "dirs",
+ "egui",
+ "log 0.0.0",
+ "once_cell",
+ "serde",
+ "serde_yaml",
+]
+
 [[package]]
 name = "copypasta"
 version = "0.10.0"
@@ -867,6 +878,7 @@ version = "0.0.0"
 dependencies = [
  "binformat",
  "bitflags 2.4.2",
+ "config",
  "crossbeam-queue",
  "dashmap",
  "gimli",
@@ -1662,6 +1674,7 @@ dependencies = [
  "bytemuck",
  "cc",
  "commands",
+ "config",
  "copypasta",
  "crossbeam-queue",
  "debugvault",
@@ -2045,6 +2058,7 @@ dependencies = [
 name = "mips"
 version = "0.0.0"
 dependencies = [
+ "config",
  "debugvault",
  "decoder",
  "tokenizing",
@@ -2532,6 +2546,7 @@ dependencies = [
  "arm",
  "binformat",
  "commands",
+ "config",
  "debugvault",
  "decoder",
  "log 0.0.0",
@@ -2724,6 +2739,7 @@ dependencies = [
 name = "riscv"
 version = "0.0.0"
 dependencies = [
+ "config",
  "crc",
  "debugvault",
  "decoder",
@@ -4153,6 +4169,7 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
 name = "x86_64"
 version = "0.0.0"
 dependencies = [
+ "config",
  "debugvault",
  "decoder",
  "tokenizing",
diff --git a/pkgs/by-name/bi/bite/package.nix b/pkgs/by-name/bi/bite/package.nix
index 4dd9e4384142..0b2d7eb14a8a 100644
--- a/pkgs/by-name/bi/bite/package.nix
+++ b/pkgs/by-name/bi/bite/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  apple-sdk_15,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
@@ -16,18 +17,17 @@
   pango,
   vulkan-loader,
   stdenv,
-  darwin,
   wayland,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "bite";
-  version = "0.2.1";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "WINSDK";
     repo = "bite";
     rev = "V${version}";
-    hash = "sha256-A5NII5pLnM4BBy2L+ylXU0anqw4DpKgXmc29fcTq2z8=";
+    hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
   };
 
   cargoLock = {
@@ -60,15 +60,11 @@ rustPlatform.buildRustPackage rec {
       pango
       vulkan-loader
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      darwin.apple_sdk.frameworks.AppKit
-      darwin.apple_sdk.frameworks.CoreGraphics
-      darwin.apple_sdk.frameworks.Foundation
-      darwin.apple_sdk.frameworks.Metal
-      darwin.apple_sdk.frameworks.QuartzCore
-    ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       wayland
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      apple-sdk_15
     ];
 
   runtimeDependencies =
@@ -95,7 +91,10 @@ rustPlatform.buildRustPackage rec {
       icon = "bite";
       desktopName = "BiTE";
       comment = meta.description;
-      categories = ["Development" "Utility"];
+      categories = [
+        "Development"
+        "Utility"
+      ];
     })
   ];
 
@@ -103,8 +102,7 @@ rustPlatform.buildRustPackage rec {
     description = "Disassembler focused on comprehensive rust support";
     homepage = "https://github.com/WINSDK/bite";
     license = licenses.mit;
-    maintainers = with maintainers; [vinnymeller];
+    maintainers = with maintainers; [ vinnymeller ];
     mainProgram = "bite";
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 }