From 7dc48f1b3385e15bdf713ace3a12575e55f40358 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 3 Dec 2025 16:02:02 -0500 Subject: [PATCH] fix egui build --- Cargo.lock | 74 ++++++++++-------------------------------------------- Cargo.toml | 19 ++++++++++++++ 2 files changed, 32 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a1e28dc..c968348 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -695,22 +695,13 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" -[[package]] -name = "ecolor" -version = "0.33.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084980ebede2fb1ad6c4f54285b3e489052ef2b6aa4016e4c19349417adc75c5" -dependencies = [ - "emath 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ecolor" version = "0.33.2" source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef39e37bc9186d9901" dependencies = [ "bytemuck", - "emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "emath", "serde", ] @@ -722,7 +713,7 @@ dependencies = [ "ahash", "bytemuck", "document-features", - "egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "egui", "egui-winit", "egui_glow", "glow", @@ -747,23 +738,6 @@ dependencies = [ "winit", ] -[[package]] -name = "egui" -version = "0.33.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75645894de4ca1695ab3ab7201c7953bb95c1725aafeefa6822dc901ad2a81b" -dependencies = [ - "ahash", - "bitflags 2.10.0", - "emath 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", - "epaint 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log", - "nohash-hasher", - "profiling", - "smallvec", - "unicode-segmentation", -] - [[package]] name = "egui" version = "0.33.2" @@ -772,8 +746,8 @@ dependencies = [ "accesskit", "ahash", "bitflags 2.10.0", - "emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", - "epaint 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "emath", + "epaint", "log", "nohash-hasher", "profiling", @@ -789,7 +763,7 @@ source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef3 dependencies = [ "arboard", "bytemuck", - "egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "egui", "log", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -808,7 +782,7 @@ version = "0.33.2" source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef39e37bc9186d9901" dependencies = [ "bytemuck", - "egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "egui", "glow", "log", "memoffset", @@ -823,8 +797,8 @@ version = "0.34.0" source = "git+https://github.com/emilk/egui_plot.git#b9acc20664c804a95e5586fbe540bf4f2f6b351f" dependencies = [ "ahash", - "egui 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", - "emath 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", + "egui", + "emath", ] [[package]] @@ -833,12 +807,6 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" -[[package]] -name = "emath" -version = "0.33.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e561352ae95c22ad179fb56c38d6e6eecd86cf4925cf5c70e738dd01df9b620" - [[package]] name = "emath" version = "0.33.2" @@ -859,22 +827,6 @@ dependencies = [ "syn", ] -[[package]] -name = "epaint" -version = "0.33.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a909ce8cee63e8350fb0c251ad39277a5b24f19add60787e84a3b3ab3f2bd83a" -dependencies = [ - "ab_glyph", - "ahash", - "ecolor 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", - "emath 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log", - "nohash-hasher", - "parking_lot", - "profiling", -] - [[package]] name = "epaint" version = "0.33.2" @@ -883,8 +835,8 @@ dependencies = [ "ab_glyph", "ahash", "bytemuck", - "ecolor 0.33.2 (git+https://github.com/titaniumtown/egui.git)", - "emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "ecolor", + "emath", "log", "nohash-hasher", "parking_lot", @@ -3907,10 +3859,10 @@ dependencies = [ "cfg-if", "const_format", "eframe", - "egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "egui", "egui_plot", - "emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", - "epaint 0.33.2 (git+https://github.com/titaniumtown/egui.git)", + "emath", + "epaint", "getrandom 0.2.16", "instant", "itertools", diff --git a/Cargo.toml b/Cargo.toml index 2266a2f..a031bdb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -94,3 +94,22 @@ wasm-bindgen-futures = "=0.4.54" [package.metadata.cargo-all-features] skip_optional_dependencies = true #don't test optional dependencies, only features + +# various dependency patches fix issues with nix complication such as: +# ```` +# ln: failed to create symbolic link '/nix/store/plh3y4gfxgwcacjccv72f551y1k89x75-cargo-vendor-dir/ecolor-0.33.2/qb43vsx43av6kf4h9y4bsmisvbjlcxd1-ecolor-0.33.2': Permission denied +# ```` + +[patch."https://github.com/emilk/egui_plot.git"] +egui = { git = "https://github.com/titaniumtown/egui.git" } +eframe = { git = "https://github.com/titaniumtown/egui.git" } +epaint = { git = "https://github.com/titaniumtown/egui.git" } +emath = { git = "https://github.com/titaniumtown/egui.git" } +ecolor = { git = "https://github.com/titaniumtown/egui.git" } + +[patch.crates-io] +egui = { git = "https://github.com/titaniumtown/egui.git" } +eframe = { git = "https://github.com/titaniumtown/egui.git" } +epaint = { git = "https://github.com/titaniumtown/egui.git" } +emath = { git = "https://github.com/titaniumtown/egui.git" } +ecolor = { git = "https://github.com/titaniumtown/egui.git" }