From ffc498c4900bbc993b88ef5525698e06fd91beca Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 28 Jan 2017 19:47:25 -0800 Subject: [PATCH] nvidia_x11: add missing vulkan files --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 32502bb7b6c0..b739fde15f74 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -19,7 +19,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module + make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_JOBS cd .. fi @@ -31,6 +31,9 @@ installPhase() { mkdir -p "$out/etc/OpenCL/vendors" cp -p nvidia.icd $out/etc/OpenCL/vendors/ + mkdir -p "$out/share/vulkan/icd.d" + cp -p nvidia_icd.json "$out/share/vulkan/icd.d/" + mkdir -p "$out/lib" cp -prd *.so.* tls "$out/lib/" rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately @@ -68,7 +71,7 @@ installPhase() { ln -srnf "$libname" "$libname_short" fi - if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so ]]; then + if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so || $libname_short =~ libGLX.so || $libname_short =~ libGLX_nvidia.so ]]; then major=0 else major=1