about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nvidia-x11/builder.sh
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2017-01-20 02:50:32 +0300
committerNikolay Amiantov <ab@fmap.me>2017-01-20 03:37:51 +0300
commit05eee18e7a70304a4807755e69b22235182b31be (patch)
treea85c91257cb2cc7a9e131877e0eafff391535d38 /pkgs/os-specific/linux/nvidia-x11/builder.sh
parent45c8c077ad1a8b811f04051dae36a39e7ae69c87 (diff)
downloadnixlib-05eee18e7a70304a4807755e69b22235182b31be.tar
nixlib-05eee18e7a70304a4807755e69b22235182b31be.tar.gz
nixlib-05eee18e7a70304a4807755e69b22235182b31be.tar.bz2
nixlib-05eee18e7a70304a4807755e69b22235182b31be.tar.lz
nixlib-05eee18e7a70304a4807755e69b22235182b31be.tar.xz
nixlib-05eee18e7a70304a4807755e69b22235182b31be.tar.zst
nixlib-05eee18e7a70304a4807755e69b22235182b31be.zip
linuxPackages.nvidia_x11: fix OpenCL support
* Move OpenCL .icd file to the right place;
* Remove libOpenCL.so (we use ocl-icd instead).
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11/builder.sh')
-rwxr-xr-xpkgs/os-specific/linux/nvidia-x11/builder.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 1f4671a76157..32502bb7b6c0 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -28,13 +28,15 @@ buildPhase() {
 
 installPhase() {
     # Install libGL and friends.
-    mkdir -p "$out/lib/vendors"
-    cp -p nvidia.icd $out/lib/vendors/
+    mkdir -p "$out/etc/OpenCL/vendors"
+    cp -p nvidia.icd $out/etc/OpenCL/vendors/
 
+    mkdir -p "$out/lib"
     cp -prd *.so.* tls "$out/lib/"
     rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
 
     rm $out/lib/libGL.so.1.* # GLVND
+    rm $out/lib/libOpenCL.so* # ocl-icd is used instead
 
     if test -z "$libsOnly"; then
         # Install the X drivers.