Fixed log and added VGA text driver #1

Closed
vanten-s wants to merge 12 commits from dev into main
Showing only changes of commit b6d591c224 - Show all commits

View file

@ -16,23 +16,16 @@ pkgs.mkShell rec {
texinfo texinfo
isl isl
]; ];
RUSTC_VERSION = "nightly"; RUSTC_VERSION = "nightly"; # Required for some experimental cargo features
hardeningDisable = [ "all" ]; hardeningDisable = [ "all" ]; # Required to compile gcc
# https://github.com/rust-lang/rust-bindgen#environment-variables
LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ]; LIBCLANG_PATH = pkgs.lib.makeLibraryPath [ pkgs.llvmPackages_latest.libclang.lib ];
shellHook = '' shellHook = ''
rustup default nightly rustup component add rust-analyzer
rustup component add rust-analyzer rustup component add rust-src # Needed for compiling to a custom target
rustup component add rust-src
rustup target add x86_64-unknown-none
export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin export PATH=$PATH:''${CARGO_HOME:-~/.cargo}/bin
export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/nightly-x86_64-unknown-linux-gnu/bin/ export PATH=$PATH:''${RUSTUP_HOME:-~/.rustup}/toolchains/nightly-x86_64-unknown-linux-gnu/bin/
export PATH=$PATH:$PWD/opt/bin export PATH="$PATH:$PWD/opt/bin"
''; '';
# Add precompiled library to rustc search path
RUSTFLAGS = (builtins.map (a: ''-L ${a}/lib'') [
# add libraries here (e.g. pkgs.libvmi)
]);
# Add glibc, clang, glib, and other headers to bindgen search path # Add glibc, clang, glib, and other headers to bindgen search path
BINDGEN_EXTRA_CLANG_ARGS = BINDGEN_EXTRA_CLANG_ARGS =
# Includes normal include path # Includes normal include path