diff options
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 9becd530b6..3ab40b1e24 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2021 Andy Tai <[email protected]> ;;; Copyright © 2021 Ekaitz Zarraga <[email protected]> ;;; Copyright © 2021 Paul Garlick <[email protected]> +;;; Copyright © 2021 Guillaume Le Vaillant <[email protected]> ;;; Copyright © 2021 Ivan Gankevich <[email protected]> ;;; ;;; This file is part of GNU Guix. @@ -408,7 +409,8 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "-DVTK_USE_SYSTEM_SQLITE:BOOL=TRUE" "-DVTK_USE_SYSTEM_THEORA:BOOL=TRUE" "-DVTK_USE_SYSTEM_TIFF:BOOL=TRUE" - "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE") + "-DVTK_USE_SYSTEM_ZLIB:BOOL=TRUE" + "-DCMAKE_C_FLAGS=-fcommon") #:tests? #f)) ;XXX: test data not included (inputs `(("double-conversion" ,double-conversion) @@ -580,10 +582,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) @@ -591,10 +591,11 @@ 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 + (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) (let ((xorg-server (assoc-ref inputs "xorg-server")) |