diff options
| author | Ivan Gankevich <i.gankevich@spbu.ru> | 2021-07-24 12:01:28 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2021-07-27 18:36:34 +0200 |
| commit | 8cfd9ef831caff790c837eca87b1164801459108 (patch) | |
| tree | 9f22ba494d47069baddb6b15b8d75414de6bc648 | |
| parent | 78daf9e02e5bc51f91488d8237cab2050cc060cf (diff) | |
| download | guix-8cfd9ef831caff790c837eca87b1164801459108.tar.gz | |
gnu: mesa-opencl-icd: Use absolute path for the library.
* gnu/packages/gl.scm (mesa-opencl-icd): Use absolute path for OpenCL platform library in "mesa.icd" file. With this patch setting LD_LIBRARY_PATH=$LIBRARY_PATH is no longer needed to run OpenCL applications. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
| -rw-r--r-- | gnu/packages/gl.scm | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c14e7c0d53..4a1a7001fe 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2020 Kei Kebreau <kkebreau@posteo.net> +;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; ;;; This file is part of GNU Guix. ;;; @@ -475,10 +476,26 @@ from software emulation to complete hardware acceleration for modern GPUs.") (package/inherit mesa-opencl (name "mesa-opencl-icd") (arguments - (substitute-keyword-arguments (package-arguments mesa) - ((#:configure-flags flags) - `(cons "-Dgallium-opencl=icd" - ,(delete "-Dgallium-opencl=standalone" flags))))))) + (substitute-keyword-arguments (package-arguments mesa) + ((#:configure-flags flags) + `(cons "-Dgallium-opencl=icd" + ,(delete "-Dgallium-opencl=standalone" flags))) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'install 'mesa-icd-absolute-path + (lambda _ + ;; Use absolute path for OpenCL platform library. + ;; Otherwise we would have to set LD_LIBRARY_PATH=LIBRARY_PATH + ;; for ICD in our applications to find OpenCL platform. + (use-modules (guix build utils) + (ice-9 textual-ports)) + (let* ((out (assoc-ref %outputs "out")) + (mesa-icd (string-append out "/etc/OpenCL/vendors/mesa.icd")) + (old-path (call-with-input-file mesa-icd get-string-all)) + (new-path (string-append out "/lib/" (string-trim-both old-path)))) + (if (file-exists? new-path) + (call-with-output-file mesa-icd + (lambda (port) (format port "~a\n" new-path))))))))))))) (define-public mesa-headers (package/inherit mesa |