From 99a039b87c4aeaf0c577102d21e30ff5e8399ae1 Mon Sep 17 00:00:00 2001
From: Ryan Butler <thebutlah@gmail.com>
Date: Sun, 14 Jul 2024 13:21:01 -0700
Subject: [PATCH] Use cargo patch for bevy_egui

---
 .gitignore |  1 +
 Cargo.lock | 26 ++++++--------------------
 Cargo.toml |  5 ++++-
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 297869c..ff85536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /.idea
 /.vscode
 /target
+/vendor
 
 *.swp
 .DS_Store
diff --git a/Cargo.lock b/Cargo.lock
index 7b56358..da1b441 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -947,7 +947,7 @@ dependencies = [
  "bevy_core",
  "bevy_core_pipeline",
  "bevy_ecs",
- "bevy_egui 0.25.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bevy_egui",
  "bevy_hierarchy",
  "bevy_log",
  "bevy_math",
@@ -1213,20 +1213,6 @@ dependencies = [
  "syn 2.0.67",
 ]
 
-[[package]]
-name = "bevy_egui"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bfb8d4104a1467910cf2090bc6a6d394ebde39c0dbc02397b45aa9ef88e80"
-dependencies = [
- "arboard",
- "bevy",
- "egui",
- "thread_local",
- "web-sys",
- "webbrowser",
-]
-
 [[package]]
 name = "bevy_egui"
 version = "0.25.0"
@@ -1246,7 +1232,7 @@ name = "bevy_egui_keyboard"
 version = "0.0.0"
 dependencies = [
  "bevy",
- "bevy_egui 0.25.0 (git+https://github.com/Schmarni-Dev/bevy_egui/?branch=nexus-use-bevy-0.13)",
+ "bevy_egui",
  "bevy_mod_picking",
  "egui-picking",
 ]
@@ -3335,7 +3321,7 @@ name = "egui-picking"
 version = "0.0.0"
 dependencies = [
  "bevy",
- "bevy_egui 0.25.0 (git+https://github.com/Schmarni-Dev/bevy_egui/?branch=nexus-use-bevy-0.13)",
+ "bevy_egui",
  "bevy_mod_picking",
 ]
 
@@ -7214,7 +7200,7 @@ version = "0.0.0"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
- "bevy_egui 0.25.0 (git+https://github.com/Schmarni-Dev/bevy_egui/?branch=nexus-use-bevy-0.13)",
+ "bevy_egui",
  "bevy_mod_inverse_kinematics",
  "bevy_mod_picking",
  "bevy_oxr",
@@ -7244,7 +7230,7 @@ version = "0.0.0"
 dependencies = [
  "bevy",
  "bevy-inspector-egui",
- "bevy_egui 0.25.0 (git+https://github.com/Schmarni-Dev/bevy_egui/?branch=nexus-use-bevy-0.13)",
+ "bevy_egui",
  "bevy_vrm",
  "color-eyre",
  "derive_more",
@@ -7273,7 +7259,7 @@ name = "social-server"
 version = "0.0.0"
 dependencies = [
  "bevy",
- "bevy_egui 0.25.0 (git+https://github.com/Schmarni-Dev/bevy_egui/?branch=nexus-use-bevy-0.13)",
+ "bevy_egui",
  "bevy_vrm",
  "bevy_web_asset",
  "clap",
diff --git a/Cargo.toml b/Cargo.toml
index 6cec05a..587ccaf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,7 @@ axum = "0.7.5"
 base64 = "0.21.7"
 bevy = { version = "0.13", features = ["serialize"] }
 bevy-inspector-egui = "0.23.4"
-bevy_egui = { git = "https://github.com/Schmarni-Dev/bevy_egui/", branch = "nexus-use-bevy-0.13" }
+bevy_egui = "0.25"
 bevy_egui_keyboard.path = "crates/bevy_egui_keyboard"
 bevy_flycam = "0.13"
 bevy_mod_inverse_kinematics = "0.6"
@@ -112,3 +112,6 @@ opt-level = 2
 
 [profile.dev.package.rapier3d]
 opt-level = 3
+
+[patch.crates-io]
+bevy_egui = { git = "https://github.com/Schmarni-Dev/bevy_egui/", branch = "nexus-use-bevy-0.13" }