diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2021-09-11 10:07:37 +0200 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2021-09-11 10:18:35 +0200 |
| commit | 463a47f4d737ad645639ed32a1c97cfc3bf00ff0 (patch) | |
| tree | e7bba5123d6c1b535a1b392cc25fc7446d7b65f2 /gnu/packages/image-processing.scm | |
| parent | 67b8aa91f7c24835dcb59409d5fa10e84ba6e748 (diff) | |
| download | guix-patches-463a47f4d737ad645639ed32a1c97cfc3bf00ff0.tar guix-patches-463a47f4d737ad645639ed32a1c97cfc3bf00ff0.tar.gz | |
gnu: opencv: Fix build.
* gnu/packages/image-processing.scm (opencv)[arguments]: Fix
'unpack-submodule-source' and 'add-ilmbase-include-path' phases.
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index e6fd4817d9..b27a80a1a7 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) |