diff options
author | Ludovic Courtès <ludo@gnu.org> | 2021-09-07 11:04:44 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-07 14:19:08 +0200 |
commit | d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a (patch) | |
tree | 2732020de20a38c09b66a60b0cb36022799f7c2e /gnu/packages/photo.scm | |
parent | b949f34f31a045eb0fb242b81a223178fb6994d3 (diff) | |
parent | 49922efb11da0f0e9d4f5979d081de5ea8c99d25 (diff) | |
download | guix-d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a.tar guix-d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a.tar.gz |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/photo.scm')
-rw-r--r-- | gnu/packages/photo.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 8a6abe5991..f292d3e8ba 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -491,7 +491,8 @@ photographic equipment.") ;; Statically link to libOpenCL. (substitute* "./src/common/dlopencl.c" (("\"libOpenCL\"") - (string-append "\"" (assoc-ref inputs "ocl-icd") "/lib/libOpenCL.so\""))) + (string-append "\"" (assoc-ref inputs "opencl-icd-loader") + "/lib/libOpenCL.so\""))) #t)) ;; The use of inline is wrong and darktable cannot compile its kernels ;; with ROCm. See upstream commit @@ -580,7 +581,7 @@ photographic equipment.") ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("lua" ,lua) ;optional, for plugins - ("ocl-icd" ,ocl-icd) ;optional, for OpenCL support + ("opencl-icd-loader" ,opencl-icd-loader) ;optional, for OpenCL support ("openexr" ,openexr) ;optional, for EXR import/export ("openjpeg" ,openjpeg) ;optional, for JPEG2000 export ("osm-gps-map" ,osm-gps-map) ;optional, for geotagging view |