commit a02035314b3bfcea855f465bf7ff0ad0e4a665f1 parent d05a776200b0395bc87c2eccbda785ab4ec7c2fd Author: Guillaume Bouchard <guillaume.bouchard@tweag.io> Date: Mon, 27 Apr 2020 16:48:26 +0200 Add a few VK_ICD_FILENAMES This is a tentative fix for #28. I cannot test nvidia, however I confirm it works for Intel (Mesa) cards. Diffstat:
| M | nixGL.nix | | | 5 | +++++ |
1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/nixGL.nix b/nixGL.nix @@ -94,6 +94,7 @@ in #!/usr/bin/env sh ${lib.optionalString (api == "Vulkan") ''export VK_LAYER_PATH=${vulkan-validation-layers}/share/vulkan/explicit_layer.d''} + ${lib.optionalString (api == "Vulkan") ''export VK_ICD_FILENAMES=${nvidia}/share/vulkan/icd.d/nvidia.json${lib.optionalString enable32bits ":${nvidia.lib32}/share/vulkan/icd.d/nvidia.json"}:$VK_ICD_FILENAMES''} export LD_LIBRARY_PATH=${lib.makeLibraryPath ([ libglvnd nvidiaLibsOnly @@ -133,6 +134,10 @@ in if [ -n "$LD_LIBRARY_PATH" ]; then echo "Warning, nixVulkanIntel overwriting existing LD_LIBRARY_PATH" 1>&2 fi + + # TODO: check mesa things other than intel + export VK_LAYER_PATH=${vulkan-validation-layers}/share/vulkan/explicit_layer.d + export VK_ICD_FILENAMES=${mesa_drivers}/share/vulkan/icd.d/intel_icd.x86_64.json${lib.optionalString enable32bits ":${pkgsi686Linux.mesa_drivers}/share/vulkan/icd.d/intel_icd.i686.json"}:$VK_ICD_FILENAMES export LD_LIBRARY_PATH=${lib.makeLibraryPath [ zlib libdrm