Subject: Re: [PATCH 1/3] gnu: Add ocl-icd.

From: [email-masked] (Ludovic Courtès)
Date: Tue, 26 Jun 2018 22:26:33 +0200

Fis Trivial <[email-masked]> skribis:

> * gnu/packages/opencl.scm (ocl-icd): New variable.

Applied with the changes below; thanks.

diff --git a/gnu/packages/opencl.scm b/gnu/packages/opencl.scm
index b9cca3406..3b65d7512 100644
--- a/gnu/packages/opencl.scm
+++ b/gnu/packages/opencl.scm
@@ -133,7 +133,10 @@ programming.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1x2dr8p4dkfds56r38av360i3nv1y3326jmshxvjngaf6mlg6rbn"))))
+                "1x2dr8p4dkfds56r38av360i3nv1y3326jmshxvjngaf6mlg6rbn"))
+              (modules '((guix build utils)))
+              (snippet
+               '(delete-file-recursively "khronos-headers"))))
     (native-inputs
      `(("opencl-headers" ,opencl-headers)
        ("ruby" ,ruby)))
@@ -141,17 +144,16 @@ programming.")
      `(("libgcrypt" ,libgcrypt)))
     (build-system gnu-build-system)
     (arguments
-     '(#:configure-flags
-       '("DEBUG_OCL_ICD=1")))
+     '(#:configure-flags '("DEBUG_OCL_ICD=1")))
     (native-search-paths
      (list (search-path-specification
             (variable "OPENCL_VENDOR_PATH")
             (files '("etc/OpenCL/vendors")))))
     (search-paths native-search-paths)
     (home-page "https://forge.imag.fr/projects/ocl-icd/")
-    (synopsis "OpenCL implementations are provided as ICD (Installable Client
-Driver)")
-    (description "OpenCL implementations are provided as ICD (Installable Client
-Driver).  An OpenCL program can use several ICD thanks to the use of an ICD
-Loader as provided by this project.  This free ICD Loader can load any ICD.")
-    (license (list license:gpl2 license:ruby))))
+    (synopsis "OpenCL loader for Installable Client Drivers (ICDs)")
+    (description
+     "OpenCL implementations are provided as ICDs (Installable Client
+Drivers).  An OpenCL program can use several ICDs thanks to the use of an ICD
+Loader as provided by this package.")
+    (license license:bsd-2)))