From 10742d0cc4b0c96542f3523c624289576511542e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 3 Dec 2025 13:09:54 -0500 Subject: [PATCH] cleanup flake.nix --- flake.lock | 20 +------------------- flake.nix | 23 +---------------------- 2 files changed, 2 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index 267e6e4..121cfca 100644 --- a/flake.lock +++ b/flake.lock @@ -38,8 +38,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", - "simon-egui": "simon-egui" + "rust-overlay": "rust-overlay" } }, "rust-overlay": { @@ -62,23 +61,6 @@ "type": "github" } }, - "simon-egui": { - "flake": false, - "locked": { - "lastModified": 1764730109, - "narHash": "sha256-vNETC0oq6tKJKF8KOGQKKIWRom38m0RwGgi3MPBrRx8=", - "owner": "Titaniumtown", - "repo": "egui", - "rev": "b63c21d70150f1b414370f0f9a8af56e886662f4", - "type": "github" - }, - "original": { - "owner": "Titaniumtown", - "repo": "egui", - "rev": "b63c21d70150f1b414370f0f9a8af56e886662f4", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 06bf439..5b8da5e 100644 --- a/flake.nix +++ b/flake.nix @@ -8,10 +8,6 @@ url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - simon-egui = { - url = "github:Titaniumtown/egui/b63c21d70150f1b414370f0f9a8af56e886662f4"; - flake = false; - }; }; outputs = @@ -20,7 +16,6 @@ nixpkgs, flake-utils, rust-overlay, - simon-egui, }: flake-utils.lib.eachDefaultSystem ( system: @@ -40,28 +35,12 @@ rustc = rustToolchain; }; - # Create a combined source with the main project and dependencies - combinedSrc = pkgs.stdenv.mkDerivation { - name = "ytbn-combined-src"; - phases = [ "installPhase" ]; - installPhase = '' - mkdir -p $out/integral_site_rust - mkdir -p $out/simon-egui - - cp -r ${./.}/* $out/integral_site_rust/ - cp -r ${simon-egui}/* $out/simon-egui/ - - chmod -R u+w $out - ''; - }; - # Build the wasm library using rustPlatform wasmLib = rustPlatform.buildRustPackage { pname = "ytbn-graphing-software-wasm"; version = "0.1.0"; - src = combinedSrc; - sourceRoot = "${combinedSrc.name}/integral_site_rust"; + src = "${./.}"; cargoLock = { lockFile = ./Cargo.lock;