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

Use nixGl auto detection fork to fix NixOS (open source NVIDIA)
Some checks failed
Build legacy Nix package on Ubuntu / build (push) Failing after 36s
Details

Browse source
This commit is contained in:
Florian RICHER 2025-01-09 15:33:33 +01:00
parent 7ed254f183
commit 34ec2894df
Signed by: florian.richer
GPG key ID: C73D37CBED7BFC77
2 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
flake.nix
View file

@ -9,7 +9,8 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nixgl = {
url = "github:nix-community/nixGL";
# Revert this to community version when https://github.com/nix-community/nixGL/pull/187 is merged
url = "github:phirsch/nixGL/fix-versionMatch";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
@ -39,25 +40,21 @@
cmake
python312
];
mkRustVulkanShell = { nixGLSupport ? true }: pkgs.mkShell {
nativeBuildInputs = with pkgs; [
(rust.override { extensions = ["rust-src" "rust-analyzer"]; })
] ++ nativeBuildInputs;
buildInputs = buildInputs
++ pkgs.lib.optionals nixGLSupport [ pkgs.nixgl.auto.nixVulkanNvidia pkgs.nixgl.nixVulkanIntel ];
LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
VK_LAYER_PATH = "${pkgs.vulkan-validation-layers}/share/vulkan/explicit_layer.d";
};
in
{
devShells = {
default = mkRustVulkanShell {};
default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
(rust.override { extensions = [ "rust-src" "rust-analyzer" ]; })
] ++ nativeBuildInputs;
# Crash with error: cannot coerce null to a string: null
nixos = mkRustVulkanShell { nixGLSupport = false; };
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";
RUST_LOG = "info,rust_vulkan_test=trace";
};
};
packages = {