diff --git a/shell.nix b/shell.nix index a2dad0d..ce1e77a 100644 --- a/shell.nix +++ b/shell.nix @@ -9,14 +9,13 @@ pkgs.mkShell rec { # OMVF ]; extraCmds = ''''; - - RUSTC_VERSION = pkgs.lib.readFile ./rust-toolchain.toml; # https://github.com/rust-lang/rust-bindgen#environment-variables LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ]; shellHook = '' - export REPBUILD_QEMU_FIRMWARE_PATH=$(find -O3 /* -name OVMF_CODE.fd 2>/dev/null | head -n 1) + export REPBUILD_QEMU_FIRMWARE_PATH=${pkgs.OVMF.fd}/FV/OVMF.fd + export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/$RUSTC_VERSION-x86_64-unknown-linux-gnu/bin/ '';