Merge pull request #21995 from abbradar/opencl

Fix OpenCL support
2017-01-20 12:09:17 +03:00
parent 7f71dd0c49 1db8ab66e3
commit d75a3cfb29
13 changed files with 152 additions and 119 deletions
@@ -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.