bite: 0.2.1 -> 0.3, fix x86_64-darwin build (#355807)

This commit is contained in:
Peder Bergebakken Sundt 2024-11-24 04:23:06 +01:00 committed by GitHub
commit 3917762ed3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 16 deletions

View File

@ -104,6 +104,7 @@ name = "arm"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"bitvec", "bitvec",
"config",
"debugvault", "debugvault",
"decoder", "decoder",
"tokenizing", "tokenizing",
@ -381,7 +382,7 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
[[package]] [[package]]
name = "bite" name = "bite"
version = "0.2.1" version = "0.3.0"
dependencies = [ dependencies = [
"commands", "commands",
"debugvault", "debugvault",
@ -696,8 +697,6 @@ dependencies = [
"egui", "egui",
"log 0.0.0", "log 0.0.0",
"once_cell", "once_cell",
"serde",
"serde_yaml",
"triple_accel", "triple_accel",
] ]
@ -710,6 +709,18 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "config"
version = "0.0.0"
dependencies = [
"dirs",
"egui",
"log 0.0.0",
"once_cell",
"serde",
"serde_yaml",
]
[[package]] [[package]]
name = "copypasta" name = "copypasta"
version = "0.10.0" version = "0.10.0"
@ -867,6 +878,7 @@ version = "0.0.0"
dependencies = [ dependencies = [
"binformat", "binformat",
"bitflags 2.4.2", "bitflags 2.4.2",
"config",
"crossbeam-queue", "crossbeam-queue",
"dashmap", "dashmap",
"gimli", "gimli",
@ -1662,6 +1674,7 @@ dependencies = [
"bytemuck", "bytemuck",
"cc", "cc",
"commands", "commands",
"config",
"copypasta", "copypasta",
"crossbeam-queue", "crossbeam-queue",
"debugvault", "debugvault",
@ -2045,6 +2058,7 @@ dependencies = [
name = "mips" name = "mips"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"config",
"debugvault", "debugvault",
"decoder", "decoder",
"tokenizing", "tokenizing",
@ -2532,6 +2546,7 @@ dependencies = [
"arm", "arm",
"binformat", "binformat",
"commands", "commands",
"config",
"debugvault", "debugvault",
"decoder", "decoder",
"log 0.0.0", "log 0.0.0",
@ -2724,6 +2739,7 @@ dependencies = [
name = "riscv" name = "riscv"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"config",
"crc", "crc",
"debugvault", "debugvault",
"decoder", "decoder",
@ -4153,6 +4169,7 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34"
name = "x86_64" name = "x86_64"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"config",
"debugvault", "debugvault",
"decoder", "decoder",
"tokenizing", "tokenizing",

View File

@ -1,5 +1,6 @@
{ {
lib, lib,
apple-sdk_15,
rustPlatform, rustPlatform,
fetchFromGitHub, fetchFromGitHub,
pkg-config, pkg-config,
@ -16,18 +17,17 @@
pango, pango,
vulkan-loader, vulkan-loader,
stdenv, stdenv,
darwin,
wayland, wayland,
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "bite"; pname = "bite";
version = "0.2.1"; version = "0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "WINSDK"; owner = "WINSDK";
repo = "bite"; repo = "bite";
rev = "V${version}"; rev = "V${version}";
hash = "sha256-A5NII5pLnM4BBy2L+ylXU0anqw4DpKgXmc29fcTq2z8="; hash = "sha256-gio4J+V8achSuR2vQa2dnvOR/u4Zbb5z0UE0xP0gGCU=";
}; };
cargoLock = { cargoLock = {
@ -60,15 +60,11 @@ rustPlatform.buildRustPackage rec {
pango pango
vulkan-loader 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 [ ++ lib.optionals stdenv.hostPlatform.isLinux [
wayland wayland
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_15
]; ];
runtimeDependencies = runtimeDependencies =
@ -95,7 +91,10 @@ rustPlatform.buildRustPackage rec {
icon = "bite"; icon = "bite";
desktopName = "BiTE"; desktopName = "BiTE";
comment = meta.description; comment = meta.description;
categories = ["Development" "Utility"]; categories = [
"Development"
"Utility"
];
}) })
]; ];
@ -105,6 +104,5 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ vinnymeller ]; maintainers = with maintainers; [ vinnymeller ];
mainProgram = "bite"; mainProgram = "bite";
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
}; };
} }