From 226da3bfc22767d88bdf4916e6dc0ad3913260c2 Mon Sep 17 00:00:00 2001 From: Muhammad Nauman Raza Date: Fri, 22 Mar 2024 23:42:32 +0000 Subject: [PATCH] flake: cleanup Former-commit-id: 9129216d7c2e107146217c32390517bf338b3282 Former-commit-id: a963cadbf0b6d50b646e467d1c5c392a0cd72247 --- flake.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 0c2103b..b94179c 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,7 @@ overlays = [fenix.overlays.default]; }; toolchain = pkgs.fenix.complete; + dependencies = with pkgs; [ SDL2 SDL2_image ]; in rec { # Executed by `nix build` @@ -36,12 +37,14 @@ pname = "rustboyadvance-ng"; name = "rustboyadvance-ng"; src = ./.; + meta.mainProgram = "rustboyadvance-sdl2"; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "libretro-backend-0.2.1" = "sha256-qsJo7wP01zhRNv4XrZJbIvOQrSJfUaqve0fNOaR6aWs="; }; }; + buildInputs = dependencies; }; # Executed by `nix run` @@ -53,9 +56,7 @@ (with toolchain; [ cargo rustc rust-src clippy rustfmt # rust components ]) - SDL2 SDL2_image - mold clang - ]; + ] ++ dependencies; RUST_SRC_PATH = "${toolchain.rust-src}/lib/rustlib/src/rust/library"; }; }