JustForFun/rust_vulkan_test
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity Actions

First renderdoc run without wayland
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 21m49s
Details

Browse source
This commit is contained in:
Florian RICHER 2025-03-22 21:51:21 +01:00
parent 1d0ef32f60
commit 30721773c8
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
5 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.nix
View file

@ -31,8 +31,17 @@
cargo = rust;
});
renderdoc = pkgs.renderdoc.overrideAttrs(oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [
(pkgs.lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" true)
];
});
buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ]
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [ libxkbcommon wayland libGL ])
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [
libxkbcommon wayland libGL # Wayland
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libxcb xorg.libxshmfence # Xorg
])
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.SystemConfiguration ]);
nativeBuildInputs = with pkgs; [
@ -40,22 +49,25 @@
cmake
python312
];
mkCustomShell = { packages ? [] }: pkgs.mkShell {
nativeBuildInputs = with pkgs; [
renderdoc
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs;
buildInputs = buildInputs
++ packages;
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d:${renderdoc}/share/vulkan/implicit_layer.d";
RUST_LOG = "info,rust_vulkan_test=trace";
};
in
{
devShells = {
default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
renderdoc
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs;
buildInputs = buildInputs
++ [ pkgs.nixgl.auto.nixVulkanNvidia pkgs.nixgl.nixVulkanMesa ];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d:${pkgs.renderdoc}/share/vulkan/implicit_layer.d";
RUST_LOG = "info,rust_vulkan_test=trace";
};
default = mkCustomShell { packages = [ pkgs.nixgl.auto.nixVulkanNvidia pkgs.nixgl.nixVulkanMesa ]; };
nixos = mkCustomShell { };
};
packages = {