fix egui build

This commit is contained in:
Simon Gardling 2025-12-03 16:02:02 -05:00
parent c0a05464f3
commit 7dc48f1b33
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 32 additions and 61 deletions

74
Cargo.lock generated
View File

@ -695,22 +695,13 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" 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]] [[package]]
name = "ecolor" name = "ecolor"
version = "0.33.2" version = "0.33.2"
source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef39e37bc9186d9901" source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef39e37bc9186d9901"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "emath",
"serde", "serde",
] ]
@ -722,7 +713,7 @@ dependencies = [
"ahash", "ahash",
"bytemuck", "bytemuck",
"document-features", "document-features",
"egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "egui",
"egui-winit", "egui-winit",
"egui_glow", "egui_glow",
"glow", "glow",
@ -747,23 +738,6 @@ dependencies = [
"winit", "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]] [[package]]
name = "egui" name = "egui"
version = "0.33.2" version = "0.33.2"
@ -772,8 +746,8 @@ dependencies = [
"accesskit", "accesskit",
"ahash", "ahash",
"bitflags 2.10.0", "bitflags 2.10.0",
"emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "emath",
"epaint 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "epaint",
"log", "log",
"nohash-hasher", "nohash-hasher",
"profiling", "profiling",
@ -789,7 +763,7 @@ source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef3
dependencies = [ dependencies = [
"arboard", "arboard",
"bytemuck", "bytemuck",
"egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "egui",
"log", "log",
"objc2 0.5.2", "objc2 0.5.2",
"objc2-foundation 0.2.2", "objc2-foundation 0.2.2",
@ -808,7 +782,7 @@ version = "0.33.2"
source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef39e37bc9186d9901" source = "git+https://github.com/titaniumtown/egui.git#b8e38096d1162959812474ef39e37bc9186d9901"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "egui",
"glow", "glow",
"log", "log",
"memoffset", "memoffset",
@ -823,8 +797,8 @@ version = "0.34.0"
source = "git+https://github.com/emilk/egui_plot.git#b9acc20664c804a95e5586fbe540bf4f2f6b351f" source = "git+https://github.com/emilk/egui_plot.git#b9acc20664c804a95e5586fbe540bf4f2f6b351f"
dependencies = [ dependencies = [
"ahash", "ahash",
"egui 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", "egui",
"emath 0.33.2 (registry+https://github.com/rust-lang/crates.io-index)", "emath",
] ]
[[package]] [[package]]
@ -833,12 +807,6 @@ version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
[[package]]
name = "emath"
version = "0.33.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e561352ae95c22ad179fb56c38d6e6eecd86cf4925cf5c70e738dd01df9b620"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.33.2" version = "0.33.2"
@ -859,22 +827,6 @@ dependencies = [
"syn", "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]] [[package]]
name = "epaint" name = "epaint"
version = "0.33.2" version = "0.33.2"
@ -883,8 +835,8 @@ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
"bytemuck", "bytemuck",
"ecolor 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "ecolor",
"emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "emath",
"log", "log",
"nohash-hasher", "nohash-hasher",
"parking_lot", "parking_lot",
@ -3907,10 +3859,10 @@ dependencies = [
"cfg-if", "cfg-if",
"const_format", "const_format",
"eframe", "eframe",
"egui 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "egui",
"egui_plot", "egui_plot",
"emath 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "emath",
"epaint 0.33.2 (git+https://github.com/titaniumtown/egui.git)", "epaint",
"getrandom 0.2.16", "getrandom 0.2.16",
"instant", "instant",
"itertools", "itertools",

View File

@ -94,3 +94,22 @@ wasm-bindgen-futures = "=0.4.54"
[package.metadata.cargo-all-features] [package.metadata.cargo-all-features]
skip_optional_dependencies = true #don't test optional dependencies, only 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" }