01/03: gnu: opencv: Fix build.

[guix-commits]

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

commit 463a47f4d737ad645639ed32a1c97cfc3bf00ff0
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Sat Sep 11 10:07:37 2021 +0200

    gnu: opencv: Fix build.
    
    * gnu/packages/image-processing.scm (opencv)[arguments]: Fix
      'unpack-submodule-source' and 'add-ilmbase-include-path' phases.
---
 gnu/packages/image-processing.scm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/image-processing.scm 
b/gnu/packages/image-processing.scm
index e6fd481..b27a80a 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2021 Andy Tai <atai@atai.org>
 ;;; Copyright © 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
 ;;; Copyright © 2021 Paul Garlick <pgarlick@tourbillion-technology.com>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -578,10 +579,8 @@ integrates with various databases on GUI toolkits such as 
Qt and Tk.")
              (mkdir "../opencv-contrib")
              (copy-recursively (assoc-ref inputs "opencv-extra")
                                "../opencv-extra")
-             (invoke "tar" "xvf"
-                     (assoc-ref inputs "opencv-contrib")
-                     "--strip-components=1"
-                     "-C" "../opencv-contrib")))
+             (copy-recursively (assoc-ref inputs "opencv-contrib")
+                               "../opencv-contrib")))
 
          (add-after 'set-paths 'add-ilmbase-include-path
            (lambda* (#:key inputs #:allow-other-keys)
@@ -590,7 +589,9 @@ integrates with various databases on GUI toolkits such as 
Qt and Tk.")
            ;; the CPATH to satisfy the dependency on "ImathVec.h".
            (setenv "CPATH"
                    (string-append
-                    (search-input-directory inputs "include/OpenEXR")
+                    (string-drop-right
+                     (search-input-file inputs "include/OpenEXR/ImathVec.h")
+                     11)
                     ":" (or (getenv "CPATH") "")))))
        (add-before 'check 'start-xserver
          (lambda* (#:key inputs #:allow-other-keys)