Rewrite nix-shell, use mold for the linker
ci/woodpecker/push/debug Pipeline failed
Details
ci/woodpecker/push/debug Pipeline failed
Details
This commit is contained in:
parent
3dfb2520ce
commit
01a74ab9a6
|
@ -1,32 +1,30 @@
|
||||||
let
|
let
|
||||||
rust_overlay = import (builtins.fetchTarball https://github.com/oxalica/rust-overlay/archive/master.tar.gz);
|
rust_overlay = import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz");
|
||||||
nixpkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
|
pkgs = import <nixpkgs> { overlays = [ rust_overlay ]; };
|
||||||
|
|
||||||
rust = (nixpkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
|
rust = (pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml).override {
|
||||||
extensions = [ "rust-analysis" "rust-src" "miri-preview" ];
|
extensions = [
|
||||||
|
"rust-analyzer"
|
||||||
|
"rust-src"
|
||||||
|
"miri-preview"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
with nixpkgs;
|
pkgs.mkShell.override {
|
||||||
stdenv.mkDerivation rec {
|
stdenv = pkgs.stdenvAdapters.useMoldLinker pkgs.clangStdenv;
|
||||||
name = "lyra_engine_dev";
|
} rec {
|
||||||
nativeBuildInputs = [
|
buildInputs = [
|
||||||
pkg-config
|
rust
|
||||||
openssl
|
] ++ (with pkgs; [
|
||||||
wasm-pack
|
pkg-config openssl udev
|
||||||
trunk
|
wasm-pack trunk
|
||||||
valgrind
|
heaptrack valgrind
|
||||||
heaptrack
|
lua5_4_compat
|
||||||
mold
|
alsa-lib libGL
|
||||||
udev
|
vulkan-loader vulkan-headers vulkan-tools
|
||||||
lua5_4_compat
|
libxkbcommon wayland # To use the wayland feature
|
||||||
rust
|
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr # To use the x11 feature
|
||||||
];
|
]);
|
||||||
buildInputs = [
|
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
|
||||||
udev alsa-lib libGL gcc
|
#RUST_BACKTRACE = 1;
|
||||||
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;
|
|
||||||
}
|
|
Loading…
Reference in New Issue