06/17: gnu: Use 'search-input-directory' for the OpenEXR header directory.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 00d1ccaf1275df3b90198f3a4a52aaf9a16cac0e
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Jul 16 15:44:33 2021 +0200

    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/graphics.scm         | 16 +++++++---------
 gnu/packages/image-processing.scm |  7 +++----
 gnu/packages/image-viewers.scm    |  9 ++++-----
 gnu/packages/photo.scm            |  8 ++++----
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index ca88acf..d794847 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Tomáš Čech <sleep_walker@gnu.org>
 ;;; Copyright © 2016, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net>
@@ -556,10 +556,9 @@ typically encountered in feature film production.")
                ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" 
to
                ;; the CPATH to satisfy the dependency on "half.h".
                (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") "")))))))))
     (inputs
      `(("boost" ,boost)
        ("jemalloc" ,jemalloc)
@@ -658,10 +657,9 @@ application can be customized via its API for Python 
scripting.")
                ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" 
to
                ;; the CPATH to satisfy the dependency on "half.h".
                (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") "")))))))))
     (inputs
      `(("boost" ,boost)
        ("jemalloc" ,jemalloc)
diff --git a/gnu/packages/image-processing.scm 
b/gnu/packages/image-processing.scm
index df77bef..e6fd481 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -589,10 +589,9 @@ integrates with various databases on GUI toolkits such as 
Qt and Tk.")
            ;; in the CPATH, so we need to add "$ilmbase/include/OpenEXR/" to
            ;; the CPATH to satisfy the dependency on "ImathVec.h".
            (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-before 'check 'start-xserver
          (lambda* (#:key inputs #:allow-other-keys)
            (let ((xorg-server (assoc-ref inputs "xorg-server"))
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 895a331..3a73490 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès 
<ludo@gnu.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
 ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner 
<efraim@flashner.co.il>
@@ -556,10 +556,9 @@ It supports JPEG, PNG and GIF formats.")
              ;; not use 'OpenEXR.pc'.  Thus, we need to add
              ;; "$ilmbase/include/OpenEXR/" to the CPATH.
              (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") ""))))))))
     (home-page "http://qtpfsgui.sourceforge.net";)
     (synopsis "High dynamic range (HDR) imaging application")
     (description
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index e867f94..2197623 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 <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2017, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2017 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner 
<efraim@flashner.co.il>
@@ -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")