From 1c24a05200761c44b2997282d83fb632ec9f3c72 Mon Sep 17 00:00:00 2001 From: Florian RICHER Date: Tue, 25 Mar 2025 12:45:30 +0100 Subject: [PATCH] Update flake.nix --- flake.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index e1a71d6..565976b 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ cargo = rust; }); - renderdoc = pkgs.renderdoc.overrideAttrs(oldAttrs: { + renderdoc = pkgs.renderdoc.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ (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 ] ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux (with pkgs; [ - libxkbcommon wayland libGL # Wayland - xorg.libX11 xorg.libXcursor xorg.libXi xorg.libxcb xorg.libxshmfence # Xorg - ]) + # Wayland + 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 ]); nativeBuildInputs = with pkgs; [ @@ -50,8 +58,8 @@ python312 ]; - mkCustomShell = { packages ? [] }: pkgs.mkShell { - nativeBuildInputs = with pkgs; [ + mkCustomShell = { packages ? [ ] }: pkgs.mkShell { + nativeBuildInputs = [ renderdoc (rust.override { extensions = [ "rust-src" "rust-analyzer" ]; }) ] ++ nativeBuildInputs;