diff options
| -rw-r--r-- | flake.lock | 45 | ||||
| -rw-r--r-- | flake.nix | 13 |
2 files changed, 49 insertions, 9 deletions
@@ -1,5 +1,26 @@ { "nodes": { + "fenix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1763448288, + "narHash": "sha256-gW/dY5WRlAxyxgYuyrTdjLDgpXr4/Mdu+pQoZRpSTGo=", + "owner": "nix-community", + "repo": "fenix", + "rev": "da5cda85b3a63baab8018ff647fb2dbe5030a2d0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -20,11 +41,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759381078, - "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -36,10 +57,28 @@ }, "root": { "inputs": { + "fenix": "fenix", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1762860488, + "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -36,14 +36,16 @@ xorg.libXinerama xorg.libXcursor xorg.libXi + xorg.libX11 libxkbcommon SDL2 ]; fenixLib = fenix.packages.${system}; - rustToolchain = with fenixLib; combine [ - stable.toolchain - targets.wasm32-unknown-emscripten.stable.toolchain - ]; + rustToolchain = with fenixLib; + combine [ + stable.toolchain + targets.wasm32-unknown-emscripten.stable.toolchain + ]; in { devShell = pkgs.mkShell @@ -51,7 +53,7 @@ packages = with pkgs; [ # rust - # rustup + rustToolchain # web emscripten python3 @@ -60,7 +62,6 @@ clang glfw pkg-config - rustToolchain ] ++ libs; |