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

Update flake.nix
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 20m35s
Details

Browse source
This commit is contained in:
Florian RICHER 2025-03-25 12:45:30 +01:00
parent 30721773c8
commit 1c24a05200
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

@ -31,7 +31,7 @@
cargo = rust; cargo = rust;
}); });
renderdoc = pkgs.renderdoc.overrideAttrs(oldAttrs: { renderdoc = pkgs.renderdoc.overrideAttrs (oldAttrs: {
cmakeFlags = oldAttrs.cmakeFlags ++ [ cmakeFlags = oldAttrs.cmakeFlags ++ [
(pkgs.lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" true) (pkgs.lib.cmakeBool "ENABLE_UNSUPPORTED_EXPERIMENTAL_POSSIBLY_BROKEN_WAYLAND" true)
]; ];
@ -39,9 +39,17 @@
buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ] buildInputs = with pkgs; [ vulkan-headers vulkan-loader vulkan-validation-layers renderdoc ]
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [ ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [
libxkbcommon wayland libGL # Wayland # Wayland
xorg.libX11 xorg.libXcursor xorg.libXi xorg.libxcb xorg.libxshmfence # Xorg libxkbcommon
]) wayland
libGL
# Xorg
xorg.libX11
xorg.libXcursor
xorg.libXi
xorg.libxcb
xorg.libxshmfence
])
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.SystemConfiguration ]); ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin (with pkgs; [ darwin.apple_sdk.frameworks.SystemConfiguration ]);
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
@ -50,8 +58,8 @@
python312 python312
]; ];
mkCustomShell = { packages ? [] }: pkgs.mkShell { mkCustomShell = { packages ? [ ] }: pkgs.mkShell {
nativeBuildInputs = with pkgs; [ nativeBuildInputs = [
renderdoc renderdoc
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; }) (rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs; ] ++ nativeBuildInputs;