Rewrite nix-shell, use mold for the linker
ci/woodpecker/push/debug Pipeline failed Details

This commit is contained in:
SeanOMik 2024-04-04 23:58:59 -04:00
parent 3dfb2520ce
commit 01a74ab9a6
Signed by: SeanOMik
GPG Key ID: FEC9E2FC15235964
1 changed files with 27 additions and 29 deletions

56
shell.nix Executable file → Normal file
View File

@ -1,32 +1,30 @@
let
rust_overlay = import (builtins.fetchTarball https://github.com/oxalica/rust-overlay/archive/master.tar.gz);
nixpkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
rust = (nixpkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
extensions = [ "rust-analysis" "rust-src" "miri-preview" ];
rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
pkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
extensions = [
"rust-analyzer"
"rust-src"
"miri-preview"
];
};
in
with nixpkgs;
stdenv.mkDerivation rec {
name = "lyra_engine_dev";
nativeBuildInputs = [
pkg-config
openssl
wasm-pack
trunk
valgrind
heaptrack
mold
udev
lua5_4_compat
rust
];
buildInputs = [
udev alsa-lib libGL gcc
vulkan-loader vulkan-headers vulkan-tools
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr # To use the x11 feature
libxkbcommon wayland # To use the wayland feature
];
LD_LIBRARY_PATH = lib.makeLibraryPath buildInputs;
}
pkgs.mkShell.override {
stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.clangStdenv;
} rec {
buildInputs = [
rust
] ++ (with pkgs; [
pkg-config openssl udev
wasm-pack trunk
heaptrack valgrind
lua5_4_compat
alsa-lib libGL
vulkan-loader vulkan-headers vulkan-tools
libxkbcommon wayland # To use the wayland feature
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr # To use the x11 feature
]);
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
#RUST_BACKTRACE = 1;
}