cleanup flake.nix

This commit is contained in:
Simon Gardling 2025-12-03 13:09:54 -05:00
parent aa07631296
commit 10742d0cc4
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 2 additions and 41 deletions

20
flake.lock generated
View File

@ -38,8 +38,7 @@
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay"
"simon-egui": "simon-egui"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -62,23 +61,6 @@
"type": "github" "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": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,

View File

@ -8,10 +8,6 @@
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
simon-egui = {
url = "github:Titaniumtown/egui/b63c21d70150f1b414370f0f9a8af56e886662f4";
flake = false;
};
}; };
outputs = outputs =
@ -20,7 +16,6 @@
nixpkgs, nixpkgs,
flake-utils, flake-utils,
rust-overlay, rust-overlay,
simon-egui,
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
system: system:
@ -40,28 +35,12 @@
rustc = rustToolchain; 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 # Build the wasm library using rustPlatform
wasmLib = rustPlatform.buildRustPackage { wasmLib = rustPlatform.buildRustPackage {
pname = "ytbn-graphing-software-wasm"; pname = "ytbn-graphing-software-wasm";
version = "0.1.0"; version = "0.1.0";
src = combinedSrc; src = "${./.}";
sourceRoot = "${combinedSrc.name}/integral_site_rust";
cargoLock = { cargoLock = {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;