From 00d1ccaf1275df3b90198f3a4a52aaf9a16cac0e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 16 Jul 2021 15:44:33 +0200 Subject: gnu: Use 'search-input-directory' for the OpenEXR header directory. * gnu/packages/graphics.scm (blender): Use 'search-input-directory' when searching for "include/OpenEXR". (blender-2.79): Likewise. * gnu/packages/image-processing.scm (opencv): Likewise. * gnu/packages/image-viewers.scm (luminance-hdr): Likewise. * gnu/packages/photo.scm (darktable): Likewise. --- gnu/packages/photo.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/photo.scm') diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index e867f94f7a..2197623363 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2017, 2019 Ludovic Courtès +;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2017 Andreas Enge ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner @@ -506,9 +506,9 @@ photographic equipment.") ;; Ensure the OpenEXR headers are found. (setenv "CPATH" - (string-append (assoc-ref inputs "ilmbase") - "/include/OpenEXR:" (or (getenv "CPATH") ""))) - #t)) + (string-append + (search-input-directory inputs "include/OpenEXR") + ":" (or (getenv "CPATH") ""))))) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (string-append (assoc-ref outputs "out") -- cgit v1.2.3