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,8 +1,10 @@
{ 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;
stdenv.mkDerivation rec {
name = "lyra_engine_dev";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
openssl openssl
@ -13,7 +15,7 @@ mkShell rec {
mold mold
udev udev
lua5_4_compat lua5_4_compat
rustup (nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain.toml; }).rust
]; ];
buildInputs = [ buildInputs = [
udev alsa-lib libGL gcc udev alsa-lib libGL gcc
@ -22,4 +24,4 @@ mkShell rec {
libxkbcommon wayland # To use the wayland feature libxkbcommon wayland # To use the wayland feature
]; ];
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs; LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
} }