diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-09-06 22:46:05 +0200 |
| commit | 66bc7fc1b3e7a85a2cfde9bb121498a181d411a4 (patch) | |
| tree | fa53c32dfef1265496170172a28a3c71bb32a655 /pkgs/os-specific/linux/nvidia-x11 | |
| parent | f9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (diff) | |
| parent | cfe51be04f8b7c36fe9f71ca5835bd683ede087f (diff) | |
| download | nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.gz nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.bz2 nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.lz nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.xz nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.tar.zst nixpkgs-66bc7fc1b3e7a85a2cfde9bb121498a181d411a4.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rwxr-xr-x | pkgs/os-specific/linux/nvidia-x11/builder.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 467d930aaf5..2b1b37db344 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -62,7 +62,10 @@ installPhase() { sed -E "s#(libnvidia-opencl)#$i/lib/\\1#" nvidia.icd > nvidia.icd.fixed install -Dm644 nvidia.icd.fixed $i/etc/OpenCL/vendors/nvidia.icd if [ -e nvidia_icd.json.template ]; then + # template patching for version < 435 sed "s#__NV_VK_ICD__#$i/lib/libGLX_nvidia.so#" nvidia_icd.json.template > nvidia_icd.json + fi + if [ -e nvidia_icd.json ]; then install -Dm644 nvidia_icd.json $i/share/vulkan/icd.d/nvidia.json fi if [ "$useGLVND" = "1" ]; then |