include correct rust install in nix-shell

This commit is contained in:
SeanOMik 2024-03-19 21:40:08 -04:00
parent 834a864544
commit f63a7ae86a
Signed by: SeanOMik
GPG Key ID: FEC9E2FC15235964
2 changed files with 30 additions and 29 deletions

View File

@ -1,5 +1,4 @@
[toolchain] [toolchain]
channel = "nightly-2023-11-21" channel = "nightly"
#components = [ "rustfmt", "rustc-dev" ] date = "2023-11-21"
targets = [ "x86_64-unknown-linux-gnu" ] targets = [ "x86_64-unknown-linux-gnu" ]
#profile = "minimal"

View File

@ -1,25 +1,27 @@
{ pkgs ? import <nixpkgs> { } }: let
moz_overlay = import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz);
with pkgs; nixpkgs = import <nixpkgs> { overlays = [ moz_overlay ]; };
in
mkShell rec { with nixpkgs;
nativeBuildInputs = [ stdenv.mkDerivation rec {
pkg-config name = "lyra_engine_dev";
openssl nativeBuildInputs = [
wasm-pack pkg-config
trunk openssl
valgrind wasm-pack
heaptrack trunk
mold valgrind
udev heaptrack
lua5_4_compat mold
rustup udev
]; lua5_4_compat
buildInputs = [ (nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain.toml; }).rust
udev alsa-lib libGL gcc ];
vulkan-loader vulkan-headers vulkan-tools buildInputs = [
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr # To use the x11 feature udev alsa-lib libGL gcc
libxkbcommon wayland # To use the wayland feature vulkan-loader vulkan-headers vulkan-tools
]; xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr # To use the x11 feature
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; libxkbcommon wayland # To use the wayland feature
} ];
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
}