From cef372377b977975a3afd00fa54f2de148a64cc8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 3 Dec 2025 02:03:11 -0500 Subject: [PATCH] fix build --- Cargo.lock | 46 ++++++++++++++++++++++++++-------------- Cargo.toml | 3 ++- flake.lock | 8 +++---- flake.nix | 61 ++++++++++++++++++++++-------------------------------- 4 files changed, 61 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3421004..e5875a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1214,9 +1214,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.83" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" +checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305" dependencies = [ "once_cell", "wasm-bindgen", @@ -2910,9 +2910,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.106" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" +checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" dependencies = [ "cfg-if", "once_cell", @@ -2922,10 +2922,24 @@ dependencies = [ ] [[package]] -name = "wasm-bindgen-futures" -version = "0.4.56" +name = "wasm-bindgen-backend" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" +checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e038d41e478cc73bae0ff9b36c60cff1c98b8f38f8d7e8061e79ee63608ac5c" dependencies = [ "cfg-if", "js-sys", @@ -2936,9 +2950,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.106" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" +checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2946,22 +2960,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.106" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" +checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" dependencies = [ - "bumpalo", "proc-macro2", "quote", "syn", + "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.106" +version = "0.2.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" dependencies = [ "unicode-ident", ] @@ -3090,9 +3104,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.83" +version = "0.3.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index fe97525..389d2d2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -89,7 +89,8 @@ wasm-bindgen = { version = "0.2", default-features = false, features = ["std"] } web-sys = "0.3" tracing-wasm = "0.2" getrandom = { version = "0.3", features = ["wasm_js"] } -wasm-bindgen-futures = "0.4" +# pinned to 0.4.54 because nix provides up to 0.2.104 wasm-bindgen-cli +wasm-bindgen-futures = "=0.4.54" [package.metadata.cargo-all-features] skip_optional_dependencies = true #don't test optional dependencies, only features diff --git a/flake.lock b/flake.lock index 267e6e4..09cf066 100644 --- a/flake.lock +++ b/flake.lock @@ -65,17 +65,17 @@ "simon-egui": { "flake": false, "locked": { - "lastModified": 1764730109, - "narHash": "sha256-vNETC0oq6tKJKF8KOGQKKIWRom38m0RwGgi3MPBrRx8=", + "lastModified": 1764740756, + "narHash": "sha256-CX0v82hDmLSEx5uFViWvfJaeADFJKR0G+MJYFFQcxng=", "owner": "Titaniumtown", "repo": "egui", - "rev": "b63c21d70150f1b414370f0f9a8af56e886662f4", + "rev": "217d3f250c499ae88c02930b26cacb945c4a2369", "type": "github" }, "original": { "owner": "Titaniumtown", "repo": "egui", - "rev": "b63c21d70150f1b414370f0f9a8af56e886662f4", + "rev": "217d3f250c499ae88c02930b26cacb945c4a2369", "type": "github" } }, diff --git a/flake.nix b/flake.nix index cc7f042..8420f3d 100644 --- a/flake.nix +++ b/flake.nix @@ -9,13 +9,21 @@ inputs.nixpkgs.follows = "nixpkgs"; }; simon-egui = { - url = "github:Titaniumtown/egui/b63c21d70150f1b414370f0f9a8af56e886662f4"; + url = "github:Titaniumtown/egui/217d3f250c499ae88c02930b26cacb945c4a2369"; flake = false; }; }; - outputs = { self, nixpkgs, flake-utils, rust-overlay, simon-egui }: - flake-utils.lib.eachDefaultSystem (system: + outputs = + { + self, + nixpkgs, + flake-utils, + rust-overlay, + simon-egui, + }: + flake-utils.lib.eachDefaultSystem ( + system: let overlays = [ (import rust-overlay) ]; pkgs = import nixpkgs { @@ -23,7 +31,7 @@ }; # Use nightly rust with wasm32 target - rustToolchain = pkgs.rust-bin.nightly."2025-05-01".default.override { + rustToolchain = pkgs.rust-bin.stable.latest.default.override { targets = [ "wasm32-unknown-unknown" ]; }; @@ -32,28 +40,6 @@ rustc = rustToolchain; }; - # Build wasm-bindgen-cli matching the version in Cargo.lock (0.2.106) - wasm-bindgen-cli = rustPlatform.buildRustPackage rec { - pname = "wasm-bindgen-cli"; - version = "0.2.106"; - - src = pkgs.fetchCrate { - inherit pname version; - hash = "sha256-M6WuGl7EruNopHZbqBpucu4RWz44/MSdv6f0zkYw+44="; - }; - - cargoHash = "sha256-ElDatyOwdKwHg3bNH/1pcxKI7LXkhsotlDPQjiLHBwA="; - - nativeBuildInputs = [ pkgs.pkg-config ]; - buildInputs = [ pkgs.openssl ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ - pkgs.curl - pkgs.darwin.apple_sdk.frameworks.Security - ]; - - # Tests require network access - doCheck = false; - }; - # Create a combined source with the main project and dependencies combinedSrc = pkgs.stdenv.mkDerivation { name = "ytbn-combined-src"; @@ -125,9 +111,9 @@ src = ./.; - nativeBuildInputs = [ + nativeBuildInputs = with pkgs; [ wasm-bindgen-cli - pkgs.binaryen + binaryen ]; buildPhase = '' @@ -211,14 +197,17 @@ zstd ]; - LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (with pkgs; [ - libxkbcommon - libGL - wayland - xorg.libX11 - xorg.libXcursor - xorg.libXi - ]); + LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath ( + with pkgs; + [ + libxkbcommon + libGL + wayland + xorg.libX11 + xorg.libXcursor + xorg.libXi + ] + ); }; } );